Merge branch 'master' into develop

Conflicts:
	README.md
This commit is contained in:
Ethan Buchman 2017-01-12 21:44:09 -05:00
commit b5ca28d60f
1 changed files with 1 additions and 1 deletions

View File

@ -6,7 +6,7 @@ Blockchains are a system for creating shared multi-master application state.
**ABCI** is a socket protocol enabling a blockchain consensus engine, running in one process,
to manage a blockchain application state, running in another.
For more information on ABCI, motivations, and tutorials, please visit [our blog post](http://tendermint.com/blog/abci-the-tendermint-socket-protocol/).
For more information on ABCI, motivations, and tutorials, please visit [our blog post](https://tendermint.com/blog/abci-the-tendermint-socket-protocol).
Other implementations:
* [cpp-abci](https://github.com/mdyring/cpp-abci) by Martin Dyring-Andersen