Carl Beekhuizen 361732f409 merge in dev and resolve conflicts

2019-06-30 21:54:30 +02:00

..

0_beacon-chain.md

merge in dev and resolve conflicts

2019-06-30 21:54:30 +02:00

0_deposit-contract.md

Makes markdown comply with linter

2019-06-30 21:25:58 +02:00

0_fork-choice.md

merge in dev and resolve conflicts

2019-06-30 21:54:30 +02:00

1_custody-game.md

merge in dev and resolve conflicts

2019-06-30 21:54:30 +02:00

1_shard-data-chains.md

merge in dev and resolve conflicts

2019-06-30 21:54:30 +02:00