OSDN Git Service

Merge branch 'dev' into dev-verify
authoroysheng <oysheng@bytom.io>
Sat, 28 Apr 2018 07:48:01 +0000 (15:48 +0800)
committeroysheng <oysheng@bytom.io>
Sat, 28 Apr 2018 07:48:01 +0000 (15:48 +0800)

Trivial merge