OSDN Git Service

Merge branch 'master' into master
authorGuanghua Guo <1536310027@qq.com>
Sat, 9 Sep 2017 07:33:48 +0000 (15:33 +0800)
committerGitHub <noreply@github.com>
Sat, 9 Sep 2017 07:33:48 +0000 (15:33 +0800)
commit6fc79bac0a402db2752cb91f43cac98c840d8139
tree10cfd1073d3c530580c928f67783dd7906063c5d
parenta2ab55e339aaa7bd092e6c4b2c894ca00ae647f3
parentee941ee3cd183f278fef547d219f64e5b78c94c0
Merge branch 'master' into master
blockchain/asset/asset.go
blockchain/asset/builder.go