From: Yongfeng LI <wliyongfeng@gmail.com>
Date: Tue, 24 Apr 2018 05:19:55 +0000 (+0800)
Subject: Merge pull request #817 from Bytom/dev
X-Git-Tag: v1.0.5~11^2^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fv1.0.0;p=bytom%2Fbytom.git

Merge pull request #817 from Bytom/dev

1.0.0
---

23e4539969cb0dab79eaeb26562c7f6971111716