chuckya/app/views/admin/reports
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
..
_action_log.html.haml Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
_status.html.haml Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
index.html.haml Avoid using pluralize on moderation pages (#12589) 2019-12-12 19:50:23 +01:00
show.html.haml Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00