Partially backport #29985, fix some template errors. * fix the manual-merge form * fix the 404 page
571 B
571 B
Partially backport #29985, fix some template errors. * fix the manual-merge form * fix the 404 page