From: Paladz <yzhu101@uottawa.ca>
Date: Wed, 31 Jul 2019 11:47:58 +0000 (+0800)
Subject: Merge pull request #1770 from Bytom/dev
X-Git-Tag: 2.0.0-alpha~77
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=82e72f962aff1d28d0d6dac2721ae6e6d71948db;hp=-c;p=bytom%2Fbytom.git

Merge pull request #1770 from Bytom/dev

Dev
---

82e72f962aff1d28d0d6dac2721ae6e6d71948db