1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-05 10:18:45 +09:00
YuruToot/app/views/admin/reports
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
_actions.html.haml Change actions in reports to require only one click (#17487) 2022-02-11 21:51:57 +01:00
_status.html.haml Add post edited notice in admin and public UIs (#17335) 2022-01-20 13:37:31 +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-02-17 10:58:44 +01:00