# Conflicts: # models/issue_comment.go # models/migrations/migrations.go # models/migrations/v64.go |
||
|---|---|---|
| .. | ||
| add_reaction.tmpl | ||
| comments.tmpl | ||
| pull.tmpl | ||
| reactions.tmpl | ||
| sidebar.tmpl | ||
# Conflicts: # models/issue_comment.go # models/migrations/migrations.go # models/migrations/v64.go |
||
|---|---|---|
| .. | ||
| add_reaction.tmpl | ||
| comments.tmpl | ||
| pull.tmpl | ||
| reactions.tmpl | ||
| sidebar.tmpl | ||