7e1aa8a5cd
Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
---|---|---|
.. | ||
actions.tmpl | ||
assignees.tmpl | ||
branch_selector_field.tmpl | ||
dependencies.tmpl | ||
due_deadline.tmpl | ||
milestones.tmpl | ||
participants.tmpl | ||
projects.tmpl | ||
pull_maintainer_edits.tmpl | ||
pull_review.tmpl | ||
pull_reviewers.tmpl | ||
pull_wip.tmpl | ||
reference.tmpl | ||
timetracking.tmpl | ||
watch.tmpl | ||
watching.tmpl |