mastodon/app/views/admin
Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
2021-05-07 18:21:59 +02:00
..
account_actions
account_moderation_notes
account_warnings
accounts
action_logs
announcements
change_emails
custom_emojis
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
domain_allows
domain_blocks
email_domain_blocks
follow_recommendations
instances
invites
ip_blocks
pending_accounts
relationships
relays
report_notes
reports
rules
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
statuses
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
warning_presets