Merge remote-tracking branch 'upstream/master' into team-grant-all-repos-work

# Conflicts:
#	models/repo.go
This commit is contained in:
David Svantesson
2019-10-26 09:56:54 +02:00
16 changed files with 190 additions and 92 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="ui right actions">
{{if and .Review}}
{{if eq .Review.Type 0}}
<div class="item tag">
<div class="item tag pending">
{{$.root.i18n.Tr "repo.issues.review.pending"}}
</div>
{{else}}