Merge remote-tracking branch 'origin/develop' into release/1.0
commitf9e54ecaeeea6c38a52958a22fb84ab184ba56a8
author尹建华 <yinjianhua@credithundred.com>
Fri, 29 Jul 2016 10:17:22 +0000 (29 18:17 +0800)
committer尹建华 <yinjianhua@credithundred.com>
Fri, 29 Jul 2016 10:17:22 +0000 (29 18:17 +0800)
tree0fd68614b75ce2230d59aa5ae164d724fbddae4e
parent8c0fbfa9a758e0a3cd37b520c75ae043cc2bef70
parent25ee8147fbfc0b4a73ff6f11c949a5e44d97f7ea
Merge remote-tracking branch 'origin/develop' into release/1.0