1
0
puyopuyotetr.is/app/views/settings/two_factor_authentication
Claire f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
  Glitch-soc used this one but not upstream.
  Upstream pulled a presumably more up-to-date version of the file.
  Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/error.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
2024-08-20 18:31:50 +02: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 commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 2024-08-20 18:31:50 +02:00