tendermint/rpc
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
2017-01-12 20:48:10 -05:00
..
core Merge branch 'master' into develop 2017-01-12 20:48:10 -05:00
grpc AppendTx -> DeliverTx 2017-01-12 15:55:03 -05:00
test AppendTx -> DeliverTx 2017-01-12 15:55:03 -05:00