Anton Nashatyrev 116c1c0f3a Merge remote-tracking branch 'EF/dev' into fix/no-committee-for-shard-case ... # Conflicts: # specs/sharding/p2p-interface.md		2021-06-04 18:43:12 +03:00
..
altair	Merge pull request #2466 from terencechain/patch-123	2021-06-02 16:09:13 -06:00
custody_game	update with configs<>presets separation	2021-05-18 09:55:20 +02:00
das	Use `ALTAIR_FORK_EPOCH` instead of `ALTAIR_FORK_SLOT`	2021-04-21 00:24:44 +08:00
merge	Merge constant/preset/config separation	2021-05-18 09:31:07 +02:00
phase0	fmt	2021-05-21 14:36:43 -06:00
sharding	Merge remote-tracking branch 'EF/dev' into fix/no-committee-for-shard-case	2021-06-04 18:43:12 +03:00