From: Paladz <yzhu101@uottawa.ca>
Date: Thu, 28 Feb 2019 03:51:02 +0000 (+0800)
Subject: Merge pull request #1601 from Bytom/dev
X-Git-Tag: 2.0.0-alpha~74^2~12
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7fb498d21bb95a6e7592aaabb539f7774bd58986;p=bytom%2Fbytom.git

Merge pull request #1601 from Bytom/dev

Dev
---

7fb498d21bb95a6e7592aaabb539f7774bd58986