mastodon/app/views/admin
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
..
account_actions
account_moderation_notes
account_warnings
accounts Add batch actions for approving and rejecting pending accounts (#10469) 2019-04-06 17:53:45 +02:00
action_logs
change_emails
custom_emojis
dashboard Change icons of features on admin dashboard to remove bias (#10366) 2019-03-26 01:24:19 +01:00
domain_blocks
email_domain_blocks
followers
instances Improve performance of list of blocked domains by caching counts (#10374) 2019-03-26 00:36:35 +01:00
invites Fix maxed-out invites not showing up as expired in UI (#10274) 2019-03-15 05:35:17 +01:00
pending_accounts Add batch actions for approving and rejecting pending accounts (#10469) 2019-04-06 17:53:45 +02:00
relays
report_notes
reports
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:01:59 +01:00
statuses
subscriptions
tags
warning_presets