mastodon/app/views/admin/reports
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +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 Fix display of instance actor in reports UI (#11798) 2019-09-09 20:42:43 +02:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00