Merge branch 'main' into glitch-soc/merge-upstream

diff --cc app/controllers/auth/sessions_controller.rb
Simple merge

diff --cc app/controllers/concerns/sign_in_token_authentication_concern.rb
Simple merge

diff --cc app/controllers/concerns/two_factor_authentication_concern.rb
Simple merge

diff --cc app/controllers/follower_accounts_controller.rb
Simple merge

diff --cc app/controllers/following_accounts_controller.rb
Simple merge

diff --cc config/navigation.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge