7 Commits (832391e2b7be8ad5be8fcea126755dcb27e914f5)

Author	SHA1	Message	Date
Sina Mahmoodi	81604199c6	merge: fix ropsten ttd (#25052)	3 years ago
Andrei Drozd	3e629777c1	Fix typo in "the merge" documentation (#25023)	3 years ago
Felix Lange	ed5e3c79dd	fix syntax error in merge.md	3 years ago
Felix Lange	dc5223d3b3	update text about ropsten merge transition	3 years ago
Felix Lange	c5b524d8bf	add ttd override for Ropsten	3 years ago
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>	3 years ago
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>	3 years ago