mastodon/app/controllers
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
..
activitypub
admin
api
auth
concerns
disputes
filters Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
oauth
settings
well_known
about_controller.rb
accounts_controller.rb
application_controller.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
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