7e1aa8a5cd
Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
|---|---|---|
| .. | ||
| security | ||
| account.tmpl | ||
| actions.tmpl | ||
| appearance.tmpl | ||
| applications.tmpl | ||
| applications_oauth2.tmpl | ||
| applications_oauth2_edit.tmpl | ||
| applications_oauth2_edit_form.tmpl | ||
| applications_oauth2_list.tmpl | ||
| blocked_users.tmpl | ||
| grants_oauth2.tmpl | ||
| hook_new.tmpl | ||
| hooks.tmpl | ||
| keys.tmpl | ||
| keys_gpg.tmpl | ||
| keys_principal.tmpl | ||
| keys_ssh.tmpl | ||
| layout_footer.tmpl | ||
| layout_head.tmpl | ||
| navbar.tmpl | ||
| organization.tmpl | ||
| packages.tmpl | ||
| packages_cleanup_rules_edit.tmpl | ||
| packages_cleanup_rules_preview.tmpl | ||
| profile.tmpl | ||
| repos.tmpl | ||
| runner_edit.tmpl | ||