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
..
account_relationships_presenter_spec.rb	Add follow request banner on account header (#20785)	2022-12-15 18:50:11 +01:00
familiar_followers_presenter_spec.rb
instance_presenter_spec.rb
status_relationships_presenter_spec.rb