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
..
activitypub	…
admin	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
api	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
auth	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
concerns	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
disputes	…
filters	…
oauth	…
settings	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
well_known	…
about_controller.rb	…
accounts_controller.rb	…
application_controller.rb	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +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	Add unsubscribe link to e-mails (#25378)	2023-06-12 14:22:46 +02:00
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
privacy_controller.rb	…
relationships_controller.rb	…
shares_controller.rb	…
statuses_cleanup_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…