From: Paladz <yzhu101@uottawa.ca>
Date: Mon, 11 Jun 2018 14:27:54 +0000 (+0800)
Subject: Merge pull request #1042 from Bytom/dev
X-Git-Tag: v1.0.5~11^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=63fa1c89b0eb443320687261d822fdede9240ca7;p=bytom%2Fbytom.git

Merge pull request #1042 from Bytom/dev

Dev
---

63fa1c89b0eb443320687261d822fdede9240ca7