Merge branch 'develop' upstream/0.2.20 v0.2.20
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 24 Jul 2017 04:03:35 +0000 (12:03 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 24 Jul 2017 04:03:35 +0000 (12:03 +0800)
commit5dde4e65d321076582a2fafe16949d2160551e81
tree82cbead97f639da72be4e8c4dd30b2772d94eece
parentbcfc298c38a0ce7a4f790e2f61e5266caa15f417
parent27a9df6477eef410cbb9a3fbe61d26f24bc4f90b
Merge branch 'develop'

0.2.20 version