Claire ac2dae0d11 Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-releases.yml`: Upstream changed comments close to a line we modified to account for different container image repositories. Updated the comments as upstream did.		2023-09-02 13:50:16 +02:00
..
activitypub	…
admin	…
api	Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream	2023-09-02 13:50:16 +02:00
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	…