Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream ... - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. - `spec/helpers/application_helper_spec.rb`: Minor conflict due to glitch-soc's theming system.		2024-12-01 17:36:49 +01:00
..
activitypub	…
admin	…
api	…
auth	…
concerns	…
disputes	…
filters	…
oauth	…
redirect	…
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	…
severed_relationships_controller.rb	…
shares_controller.rb	…
statuses_cleanup_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…