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)
commit56b2a2c0746e626d77a4c989c515b45cb7de4d56
treed6cb95e0c98b456f32c7e38333b84a85d15daee7
parent1cfbaf4422fd5c31f1e64c4351bdcddd01278a2e
parent9b25ed34af4d8f9ed7feb66684d0e8ef530d6d0a
Merge branch 'dev' into wallet