Merge branch 'develop' into release/1.0
commit8c0fbfa9a758e0a3cd37b520c75ae043cc2bef70
author尹建华 <yinjianhua@credithundred.com>
Fri, 29 Jul 2016 06:02:17 +0000 (29 14:02 +0800)
committer尹建华 <yinjianhua@credithundred.com>
Fri, 29 Jul 2016 06:02:17 +0000 (29 14:02 +0800)
tree59159db5febad75fe7d1c0c46ff0db285bf45942
parentc40896209fd3faf233373f3bfa18d5df5402d1ff
parentc605c92e37160ea8a2bd784300f29c8e266f704a
Merge branch 'develop' into release/1.0