Ethan Buchman 7fb0e8b30b Merge branch 'feature/tx-proof' into feature/237-tx-indexing ...

Conflicts:
	types/tx.go

2017-04-12 18:48:39 -04:00

..

client

Merge branch 'feature/tx-proof' into feature/237-tx-indexing

2017-04-12 18:48:39 -04:00

core

add Height to ResultBroadcastTxCommit and EventDataTx

2017-04-12 18:33:48 -04:00

grpc

AppendTx -> DeliverTx

2017-01-12 15:55:03 -05:00

test

Revert "Undo last two commits"

2017-04-11 15:44:36 -04:00