Hsiao-Wei Wang c8dc30eec2 Recover from auto-merge		2019-06-30 01:56:10 +08:00
..
0_beacon-chain.md	Recover from auto-merge	2019-06-30 01:56:10 +08: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	resolved merge conflicts, take attesters seq->set change from dev, take bits rework from bitlistvector PR	2019-06-28 18:17:13 +02:00
1_shard-data-chains.md	Cleanup naming	2019-06-28 12:23:22 +01:00