From: Paladz <yzhu101@uottawa.ca>
Date: Wed, 28 Nov 2018 04:16:20 +0000 (+0800)
Subject: Merge pull request #1498 from Bytom/dev
X-Git-Tag: 2.0.0-alpha~101
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=deb6f35136f7445f19d554324a25739551931815;hp=8db1264b903bc94fbe9a12a3549d52a69c1876ca;p=bytom%2Fbytom.git

Merge pull request #1498 from Bytom/dev

Dev
---