OSDN Git Service

Merge branch 'master' into dev-coinbase
authoroys <oys@oysdeMBP.localdomain>
Thu, 4 Jul 2019 07:46:55 +0000 (15:46 +0800)
committeroys <oys@oysdeMBP.localdomain>
Thu, 4 Jul 2019 07:46:55 +0000 (15:46 +0800)
commitba0869abd04dbd89d254d05108b9d03c04633d05
tree54676998b8b310d19d1eb0a7082b6d1404b22a8a
parenta573aa2e8ea5d2985d9674170857b51d4152eb7c
parentf30b7541256e6a7f6f875994cb08edf3bddab93c
Merge branch 'master' into dev-coinbase
protocol/bc/types/map.go
protocol/state/vote_result.go