From: Paladz <yzhu101@uottawa.ca>
Date: Mon, 22 Apr 2019 07:04:42 +0000 (+0800)
Subject: Merge pull request #1734 from Bytom/dev
X-Git-Tag: 2.0.0-alpha~74^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce32228f04dda39087fc254df21c7887b4782b37;p=bytom%2Fbytom.git

Merge pull request #1734 from Bytom/dev

Dev
---

ce32228f04dda39087fc254df21c7887b4782b37