Carl Beekhuizen 26afa077fd Resolves conflicts and merges in dev

2019-04-18 23:17:53 +02:00

..

0_beacon-chain.md

Resolves conflicts and merges in dev

2019-04-18 23:17:53 +02:00

1_custody-game.md

More fixes

2019-04-18 14:43:24 +10:00

1_shard-data-chains.md

Update 1_shard-data-chains.md

2019-04-16 12:03:22 -05:00