Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.		2023-01-14 22:34:09 +01:00
..
credentials_controller.rb	Allow changing hide_collections setting with the api (#22790)	2023-01-13 16:40:21 +01:00
familiar_followers_controller.rb
featured_tags_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
identity_proofs_controller.rb
lists_controller.rb
lookup_controller.rb
notes_controller.rb
pins_controller.rb
relationships_controller.rb
search_controller.rb
statuses_controller.rb