wxiaoguang 24c66c5096

Fix manual merge form and 404 page templates (#30000) ...

Partially backport #29985, fix some template errors.

* fix the manual-merge form
* fix the 404 page

2024-03-22 19:42:41 +08:00

..

404.tmpl

Fix manual merge form and 404 page templates (#30000)

2024-03-22 19:42:41 +08:00

500.tmpl

…