mastodon/app/views/admin
Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
..
account_actions
account_moderation_notes
account_warnings
accounts
action_logs
change_emails
custom_emojis
dashboard
domain_blocks
email_domain_blocks
followers
instances
invites
relays
report_notes
reports
settings
statuses
subscriptions
tags
warning_presets