From: Paladz <yzhu101@uottawa.ca>
Date: Mon, 19 Nov 2018 05:59:50 +0000 (+0800)
Subject: Merge pull request #1481 from Bytom/dev
X-Git-Tag: 2.0.0-alpha~74^2~21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=efbcda0da8644de9c9841f718c079d4083e975c0;p=bytom%2Fbytom.git

Merge pull request #1481 from Bytom/dev

Dev
---

efbcda0da8644de9c9841f718c079d4083e975c0