Danny Ryan 69e7f586ac Merge pull request #2738 from ethereum/fix-names ... is_merge -> is_merge_transition		2021-11-23 14:52:05 -07:00
..
beacon-chain.md	is_merge -> is_merge_transition	2021-11-23 14:45:03 -07:00
client-settings.md	Fix setup.py parser and rename `TBH_ACTIVATION_EPOCH` -> `TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH`	2021-10-19 11:26:53 +08:00
fork-choice.md	Merge pull request #2738 from ethereum/fix-names	2021-11-23 14:52:05 -07:00
fork.md	Hardcode terminal total difficulty	2021-09-17 16:20:25 +06:00
p2p-interface.md	remove etra gas constants and p2p validations	2021-11-01 07:39:14 -06:00
validator.md	Merge pull request #2738 from ethereum/fix-names	2021-11-23 14:52:05 -07:00