OSDN Git Service

Merge branch 'dev' into wallet
authorBlockmeta-区块元 <blockmeta@8btc.com>
Sat, 28 Oct 2017 05:53:17 +0000 (13:53 +0800)
committerBlockmeta-区块元 <blockmeta@8btc.com>
Sat, 28 Oct 2017 05:53:17 +0000 (13:53 +0800)

Trivial merge