mastodon/app/views/admin
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
account_actions Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_moderation_notes
account_warnings Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
action_logs
change_emails
custom_emojis
dashboard
domain_blocks
email_domain_blocks
instances
invites
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
settings
statuses
subscriptions
tags
warning_presets Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00