Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		2022-04-06 21:10:23 +02:00
..
challenges_controller.rb
confirmations_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
setup_controller.rb