Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.		2023-04-09 11:45:08 +02:00
..
confirmations_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
otp_authentication_controller.rb	Remove unused methods in 2FA OTP Auth Controller (#24220)	2023-04-07 14:13:53 +02:00
recovery_codes_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
webauthn_credentials_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00