mastodon/app/views/admin/reports
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
..
_action_log.html.haml Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
_status.html.haml Fix expand video on public page (#15469) 2020-12-30 23:18:11 +01:00
index.html.haml Add indication to admin UI of whether a report has been forwarded (#13237) 2020-12-15 04:30:15 +01:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00