e5f8d144f2
--- Conflict resolution: trivial Things done differently: Improve localization message, use the paragraph element instead of the div element, fix passing this variable to the template and add a integration test (cherry picked from commit 9633f336c87947dc7d2a5e76077a10699ba5e50d) |
||
|---|---|---|
| .. | ||
| 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 | ||