catstodon/app/views/auth/sessions
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
..
two_factor Fix LineLength haml-lint in app/views/auth area (#28664) 2024-01-09 16:03:16 +00:00
new.html.haml Fix LineLength haml-lint in app/views/auth area (#28664) 2024-01-09 16:03:16 +00:00
two_factor.html.haml Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 2023-10-17 20:59:18 +02:00