aboutsummaryrefslogtreecommitdiffstats
path: root/templates/repo/issue/milestone_issues.tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'templates/repo/issue/milestone_issues.tmpl')
-rw-r--r--templates/repo/issue/milestone_issues.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 0f4509ecbc..00d335da7d 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -251,7 +251,7 @@
{{end}}
{{if gt $rejectOfficial 0}}
- <span class="rejects">{{svg "octicon-request-changes" 16}}
+ <span class="rejects">{{svg "octicon-diff" 16}}
{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
</span>
{{end}}
@@ -263,7 +263,7 @@
{{end}}
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
- <span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
+ <span class="conflicting">{{svg "octicon-x" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
{{end}}
{{end}}
</p>