Mastodon

Files

Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.

2023-07-13 13:35:15 +02: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

…

status_edits

…

statuses

…