From: icodezjb <icodezjb@163.com>
Date: Thu, 28 Sep 2017 05:02:00 +0000 (+0800)
Subject: Merge pull request #8 from Bytom/demo
X-Git-Tag: v1.0.5~471^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=09344609bfbc1a06060597710d9bbe5059415db0;p=bytom%2Fbytom.git

Merge pull request #8 from Bytom/demo

sync Demo
---

09344609bfbc1a06060597710d9bbe5059415db0