mastodon-glitch/app/views/settings/two_factor_authentication
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
recovery_codes
webauthn_credentials Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00