Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
activitypub
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
disputes
filters
oauth	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 21:56:05 +01:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-16 08:30:00 +01:00
well_known
about_controller.rb
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
application_controller.rb
authorize_interactions_controller.rb
custom_css_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
following_accounts_controller.rb	Fix single name variables on controller folder (#20092)	2022-12-15 17:11:58 +01:00
health_controller.rb
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
media_proxy_controller.rb
privacy_controller.rb
relationships_controller.rb
shares_controller.rb
statuses_cleanup_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
tags_controller.rb	Fix single name variables on controller folder (#20092)	2022-12-15 17:11:58 +01:00