5 commits

Author	SHA1	Message	Date
Felix Lange	ed5e3c79dd	fix syntax error in merge.md	2022-05-27 00:51:55 +02:00
Felix Lange	dc5223d3b3	update text about ropsten merge transition	2022-05-27 00:49:04 +02:00
Felix Lange	c5b524d8bf	add ttd override for Ropsten	2022-05-27 00:42:04 +02:00
Joseph Cook	65592fb3e5	add info to merge page (#24972) ... * add info to merge page * Update merge.md Co-authored-by: Felix Lange <fjl@twurst.com>	2022-05-26 23:43:37 +02:00
Sina Mahmoodi	545feda51a	docs: add basic info about the merge (#24948) ... * merge: add basic info * second pass * merge guide updates Co-authored-by: Felix Lange <fjl@twurst.com>	2022-05-25 14:21:18 +02:00