Merge pull request #538 from benjaminbollen/develop
Merge master into develop
Showing
- CHANGELOG.md 15 additions, 15 deletionsCHANGELOG.md
- Dockerfile 1 addition, 1 deletionDockerfile
- Dockerfile.armhf 2 additions, 2 deletionsDockerfile.armhf
- LICENSE.md 0 additions, 0 deletionsLICENSE.md
- Makefile 8 additions, 8 deletionsMakefile
- README.md 11 additions, 13 deletionsREADME.md
- account/account.go 2 additions, 2 deletionsaccount/account.go
- account/priv_account.go 1 addition, 1 deletionaccount/priv_account.go
- blockchain/filter.go 4 additions, 4 deletionsblockchain/filter.go
- circle.yml 2 additions, 13 deletionscircle.yml
- client/cmd/eris-client.go 3 additions, 3 deletionsclient/cmd/eris-client.go
- client/cmd/eris-client/main.go 1 addition, 1 deletionclient/cmd/eris-client/main.go
- client/cmd/genesis.go 2 additions, 2 deletionsclient/cmd/genesis.go
- client/cmd/status.go 2 additions, 2 deletionsclient/cmd/status.go
- client/cmd/transaction.go 2 additions, 2 deletionsclient/cmd/transaction.go
- client/methods/call.go 4 additions, 4 deletionsclient/methods/call.go
- client/methods/helpers.go 6 additions, 6 deletionsclient/methods/helpers.go
- client/methods/send.go 4 additions, 4 deletionsclient/methods/send.go
- client/methods/status.go 2 additions, 2 deletionsclient/methods/status.go
- client/mock/client_mock.go 6 additions, 6 deletionsclient/mock/client_mock.go
Loading
Please register or sign in to comment