tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.
This commit is contained in:
Claire
2023-01-14 22:34:09 +01:00
parent afd0d424da d66dfc7b3c
commit ab59743c13
13 changed files with 211 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/reports/show.html.haml
View File

@@ -177,7 +177,7 @@
- if @report.unresolved?
%hr.spacer/
%p#actions= t 'admin.reports.actions_description_html'
%p#actions= t(@report.target_account.local? ? 'admin.reports.actions_description_html' : 'admin.reports.actions_description_remote_html')
= render partial: 'admin/reports/actions'