1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 14:18:34 +09:00
YuruToot/app/views/admin/reports
Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
..
_status.html.haml Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
index.html.haml Add ability to filter reports by origin of target account (#16487) 2021-07-11 11:01:38 +02:00
show.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00