Claire 63acdebc5d Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines.		2024-01-11 13:17:13 +01:00
..
confirmations	Fix `LineLength` haml-lint in `app/views/settings` area (#28663)	2024-01-09 15:28:56 +00:00
otp_authentication	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
recovery_codes	Fix #3910 - Require OTP authentication to disable 2FA (#3935)	2017-06-25 23:51:46 +02:00
webauthn_credentials	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00