OSDN Git Service

Merge branch 'dev' into wallet
authorjianyixun <317316abcd@163.com>
Wed, 25 Oct 2017 19:28:49 +0000 (03:28 +0800)
committerjianyixun <317316abcd@163.com>
Wed, 25 Oct 2017 19:28:49 +0000 (03:28 +0800)
commit3e240559fd24e0484d2efda4c1d5d4d4f643732e
treefd15c68ada1293e870a82549aafe8f16fa653aa7
parent0624cb450bdb2c87ba6f715a28e34670f60fa2ed
parente2d06fd48a397e4bb2be47d97f0a0b95d3e18202
Merge branch 'dev' into wallet

Conflicts:
blockchain/pseudohsm/pseudohsm_test.go
blockchain/account/accounts.go
blockchain/pseudohsm/pseudohsm_test.go
blockchain/transact.go
config/config.go