Merge remote-tracking branch 'origin/release-0.16' into develop
Showing
- CHANGELOG.md 66 additions, 0 deletionsCHANGELOG.md
- README.md 46 additions, 19 deletionsREADME.md
- circle.yml 3 additions, 0 deletionscircle.yml
- config/config.go 1 addition, 1 deletionconfig/config.go
- config/templates.go 3 additions, 20 deletionsconfig/templates.go
- consensus/config.go 0 additions, 3 deletionsconsensus/config.go
- consensus/tendermint/config.go 14 additions, 3 deletionsconsensus/tendermint/config.go
- consensus/tendermint/local_client.go 0 additions, 265 deletionsconsensus/tendermint/local_client.go
- consensus/tendermint/tendermint.go 4 additions, 7 deletionsconsensus/tendermint/tendermint.go
- consensus/tendermint/version.go 1 addition, 1 deletionconsensus/tendermint/version.go
- consensus/tmsp/server.go 0 additions, 209 deletionsconsensus/tmsp/server.go
- consensus/tmsp/version.go 0 additions, 35 deletionsconsensus/tmsp/version.go
- consensus/types/consensus_engine.go 2 additions, 2 deletionsconsensus/types/consensus_engine.go
- core/core.go 1 addition, 1 deletioncore/core.go
- docs/PROPOSALS.md 17 additions, 0 deletionsdocs/PROPOSALS.md
- event/events.go 2 additions, 2 deletionsevent/events.go
- glide.lock 95 additions, 77 deletionsglide.lock
- glide.yaml 3 additions, 2 deletionsglide.yaml
- manager/eris-mint/eris-mint.go 20 additions, 21 deletionsmanager/eris-mint/eris-mint.go
- manager/eris-mint/evm/abi/types.go 23 additions, 11 deletionsmanager/eris-mint/evm/abi/types.go
Loading
Please register or sign in to comment