glitch-soc/app/views/settings/two_factor_authentication
Claire 05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
2025-01-21 19:23:25 +01:00
..
confirmations Provide `use_path` to qr generator for svg data size reduction (#32127) 2024-10-02 13:26:46 +00:00
otp_authentication Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
recovery_codes Fix #3910 - Require OTP authentication to disable 2FA (#3935) 2017-06-25 23:51:46 +02:00
webauthn_credentials Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 2025-01-21 19:23:25 +01:00