Rebase onto develop

This commit is contained in:
Christopher Goes
2018-04-17 16:28:33 +02:00
parent a8d3b3ef19
commit 6500728dd2
-1
View File
@@ -5,7 +5,6 @@ the Cosmos Hub.
NOTE: the specifications are not yet complete and very much a work in progress.
<<<<<<< HEAD
- [Basecoin](basecoin) - Cosmos SDK related specifications and transactions for
sending tokens.
- [Staking](staking) - Proof of Stake related specifications including bonding