Merge branch 'develop' into release/1.0
commitc8122474f55d43e83ffc127d61bc33f503bf809c
author尹建华 <yinjianhua@credithundred.com>
Thu, 4 Aug 2016 07:00:55 +0000 (4 15:00 +0800)
committer尹建华 <yinjianhua@credithundred.com>
Thu, 4 Aug 2016 07:00:55 +0000 (4 15:00 +0800)
tree04767ddd6d6b2032bbcd91e8de4ff3ba92a6d40b
parent62d6c95538b078c9a163e75f3421ada9c20e0703
parentf051dbf4df2fa828149ee2853a08a2c3228761b1
Merge branch 'develop' into release/1.0