7e1aa8a5cd
Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
---|---|---|
.. | ||
applications | ||
auth | ||
emails | ||
org | ||
packages | ||
repo | ||
runners | ||
user | ||
actions.tmpl | ||
config.tmpl | ||
config_settings.tmpl | ||
cron.tmpl | ||
dashboard.tmpl | ||
hook_new.tmpl | ||
hooks.tmpl | ||
layout_footer.tmpl | ||
layout_head.tmpl | ||
navbar.tmpl | ||
notice.tmpl | ||
queue.tmpl | ||
queue_manage.tmpl | ||
self_check.tmpl | ||
stacktrace-row.tmpl | ||
stacktrace.tmpl | ||
stats.tmpl | ||
system_status.tmpl |