From: Yongfeng LI <wliyongfeng@gmail.com>
Date: Thu, 19 Apr 2018 01:47:26 +0000 (+0800)
Subject: Merge pull request #20 from Bytom/dev
X-Git-Tag: v1.0.0~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8e6cc7304c63d97b70dc82c62a57f690b5a00f35;p=bytom%2Fbytom-electron.git

Merge pull request #20 from Bytom/dev

Dev
---

8e6cc7304c63d97b70dc82c62a57f690b5a00f35