rhuairahrighairigh 3b325798c2 Merge branch 'master' into add-payment-channels ... # Conflicts: # cmd/kvcli/main.go # internal/app/app.go		2018-08-24 12:12:26 -04:00
..
app_test.go	update sdk	2018-06-16 22:34:07 +01:00
app.go	Merge branch 'master' into add-payment-channels	2018-08-24 12:12:26 -04:00
genesis.go	adjust starting tokens	2018-08-17 16:33:48 -04:00