Commit Graph

6 Commits

Author SHA1 Message Date
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
Ethan Buchman 8390e88e27 fix flowrate dep and test 2016-12-09 01:28:08 -05:00
Ethan Buchman 01a3ac50af update glide 2016-11-03 20:16:44 -04:00
Ethan Buchman f0871e4f5e update some scripts 2016-10-12 12:27:37 -04:00
Ethan Buchman c4764ff916 update glide.lock 2016-08-10 02:16:44 -04:00
Ethan Buchman 8987d29bee tests: broadcast_tx with tmsp; p2p 2016-07-24 14:08:47 -04:00