Merge remote-tracking branch 'origin/release/1.0'1.0.0
commit5c9d8ebea11e2ede0a26bd14ff1a59ba2f6ffbc7
author尹建华 <yinjianhua@credithundred.com>
Mon, 22 Aug 2016 07:58:18 +0000 (22 15:58 +0800)
committer尹建华 <yinjianhua@credithundred.com>
Mon, 22 Aug 2016 07:58:18 +0000 (22 15:58 +0800)
treef04107a3a62e24e00a7031509fae595b49315117
parent25f2345486712c91db840e8eb39fc62b78f44d43
parentf6b1de93f8b64666d6d3fea3bb4994de64b7d91e
Merge remote-tracking branch 'origin/release/1.0'