From: Paladz <yzhu101@uottawa.ca>
Date: Mon, 19 Nov 2018 06:35:09 +0000 (+0800)
Subject: Merge pull request #1485 from Bytom/prod
X-Git-Tag: 2.0.0-alpha~103
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e6dc6b0a9bc8aa1b37e92be0e511221a688137a;p=bytom%2Fbytom.git

Merge pull request #1485 from Bytom/prod

Prod
---

5e6dc6b0a9bc8aa1b37e92be0e511221a688137a