Dankrad Feist ec230f443a Merge branch 'dev' into dankrad-patch-7 ...

# Conflicts:
#	specs/core/1_custody-game.md
#	specs/core/1_shard-data-chains.md

2019-05-09 01:00:25 +01:00

..

0_beacon-chain.md

Merge branch 'dev' into JustinDrake-patch-10

2019-05-08 08:42:47 -06:00

0_deposit-contract.md

Doc standardization (#1039)

2019-05-06 16:30:32 +01:00

0_fork-choice.md

More renaming

2019-05-06 20:49:46 +01:00

1_custody-game.md

Merge branch 'dev' into dankrad-patch-7

2019-05-09 01:00:25 +01:00

1_shard-data-chains.md

Merge branch 'dev' into dankrad-patch-7

2019-05-09 01:00:25 +01:00