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

diff --cc Gemfile.lock
Simple merge

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/settings/two_factor_authentication/webauthn_credentials_controller.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge