mastodon/app/views/admin
Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +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
software_updates
status_edits
statuses
tags
trends
users/roles
warning_presets
webhooks