mastodon/app/controllers
Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
2023-10-24 19:31:14 +02:00
..
activitypub
admin
api
auth
concerns
disputes
filters
oauth
settings
well_known
about_controller.rb
accounts_controller.rb
application_controller.rb
authorize_interactions_controller.rb
backups_controller.rb
custom_css_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
health_controller.rb
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
mail_subscriptions_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
privacy_controller.rb
relationships_controller.rb
remote_interaction_helper_controller.rb
shares_controller.rb
statuses_cleanup_controller.rb
statuses_controller.rb
tags_controller.rb