Ethan Buchman
f347143b3d
Merge branch 'master' into develop
Conflicts: cmd/tendermint/flags.go glide.lock glide.yaml node/node.go rpc/core/routes.go version/version.go |
8 years ago | |
---|---|---|
.. | ||
id.go | Bare consensus refactor | 9 years ago |
log.go | Refactor to move common libraries out of project | 9 years ago |
node.go | Merge branch 'master' into develop | 8 years ago |
node_test.go | proxy: NewAppConns takes a NewTMSPClient func | 8 years ago |