Dankrad Feist 2622548ba7 Merge remote-tracking branch 'origin/dev' into dankrad-patch-8 ... # Conflicts: # specs/core/0_beacon-chain.md		2019-06-28 08:36:45 +01:00
..
0_beacon-chain.md	Merge remote-tracking branch 'origin/dev' into dankrad-patch-8	2019-06-28 08:36:45 +01:00
0_deposit-contract.md	phase 0 doc standardization b4 spec freeze (#1212)	2019-06-25 14:32:56 +01:00
0_fork-choice.md	Merge branch 'dev' into checkpoints	2019-06-27 21:02:48 -06:00
1_custody-game.md	More linting fixes	2019-06-27 16:47:48 +01:00
1_shard-data-chains.md	Phase 1 to Bitvector/Bitlist	2019-06-27 12:41:22 +01:00