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
..
challenges	Fix `LineLength` haml-lint in `app/views/auth` area (#28664)	2024-01-09 16:03:16 +00:00
confirmations	Fix `LineLength` haml-lint in `app/views/auth` area (#28664)	2024-01-09 16:03:16 +00:00
passwords	Fix `LineLength` haml-lint in `app/views/auth` area (#28664)	2024-01-09 16:03:16 +00:00
registrations	Fix `LineLength` haml-lint in `app/views/auth` area (#28664)	2024-01-09 16:03:16 +00:00
sessions	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream	2024-01-11 13:17:13 +01:00
setup	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream	2024-01-11 13:17:13 +01:00
shared	Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368)	2023-10-25 21:33:44 +00:00