Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
|---|---|---|
| .. | ||
| code.tmpl | ||
| navbar.tmpl | ||
| repo_list.tmpl | ||
| repos.tmpl | ||
| search.tmpl | ||
| user_list.tmpl | ||
| users.tmpl | ||
Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
|---|---|---|
| .. | ||
| code.tmpl | ||
| navbar.tmpl | ||
| repo_list.tmpl | ||
| repos.tmpl | ||
| search.tmpl | ||
| user_list.tmpl | ||
| users.tmpl | ||