mastodon/app/views/admin
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
..
account_actions
account_warnings
accounts
action_logs
announcements
change_emails
custom_emojis
dashboard
disputes/appeals
domain_allows
domain_blocks
email_domain_blocks
export_domain_allows
export_domain_blocks
follow_recommendations
instances
invites
ip_blocks
relationships
relays
report_notes
reports
roles
rules
settings Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
software_updates
status_edits
statuses
tags
trends
users/roles
warning_presets
webhooks