mastodon/app/views/admin
Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
2021-03-02 12:06:58 +01:00
..
account_actions
account_moderation_notes
account_warnings
accounts
action_logs
announcements
change_emails
custom_emojis
dashboard
domain_allows
domain_blocks
email_domain_blocks
instances
invites
ip_blocks
pending_accounts
relationships
relays
report_notes
reports
rules
settings
statuses
tags
warning_presets