mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-12 22:53:21 +01:00
7e1aa8a5cd
Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
---|---|---|
.. | ||
sidebar | ||
add_reaction.tmpl | ||
attachments.tmpl | ||
comments.tmpl | ||
comments_authorlink.tmpl | ||
comments_delete_time.tmpl | ||
context_menu.tmpl | ||
conversation.tmpl | ||
pull.tmpl | ||
pull_merge_instruction.tmpl | ||
reactions.tmpl | ||
reference_issue_dialog.tmpl | ||
show_role.tmpl | ||
sidebar.tmpl | ||
update_branch_by_merge.tmpl |