Dankrad Feist 29c1569251 Merge branch 'dev' into dankrad-custody-256bit ... # Conflicts: # specs/phase1/beacon-chain.md		2020-06-12 12:29:57 +01:00
..
beacon-chain.md	Merge branch 'dev' into dankrad-custody-256bit	2020-06-12 12:29:57 +01:00
custody-game.md	Fix TOC	2020-06-12 12:07:31 +01:00
fork-choice.md	`head_shard_root` -> `shard_head_root`	2020-06-04 01:00:52 +08:00
light-client-sync.md	merge in dev (v0.10) and fix reorg/lint issues	2020-01-13 18:55:21 +01:00
phase1-fork.md	Merge branch 'dev' into dankrad-custody-256bit	2020-06-09 01:39:51 +08:00
shard-fork-choice.md	PR feedback from danny	2020-06-09 00:13:27 +08:00
shard-transition.md	PR feedback from danny: simplify `verify_shard_block_message` params	2020-06-08 23:49:24 +08:00