Carl Beekhuizen 3418c3506f Merge dev and resolve conflicts (please let the CI tests pass with the new dev)

2019-06-19 20:27:54 +02:00

..

0_beacon-chain.md

remove unnecessary cast

2019-06-18 22:00:22 +02:00

0_deposit-contract.md

Address Danny's comments

2019-06-10 15:55:08 +01:00

0_fork-choice.md

Merge dev and resolve conflicts (please let the CI tests pass with the new dev)

2019-06-19 20:27:54 +02:00

1_custody-game.md

Merge branch 'dev' into mypy

2019-06-17 17:51:00 -04:00

1_shard-data-chains.md

Merge dev and resolve conflicts (please let the CI tests pass with the new dev)

2019-06-19 20:27:54 +02:00