Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.		2023-04-22 10:06:11 +02:00
..
challenges	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
confirmations	Fix incorrect translation string in glitch-soc captcha feature	2023-02-19 11:02:27 +01:00
passwords	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
registrations	Add progress indicator to sign-up flow (#24545)	2023-04-16 07:01:24 +02:00
sessions	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
setup	Add progress indicator to sign-up flow (#24545)	2023-04-16 07:01:24 +02:00
shared	Add progress indicator to sign-up flow (#24545)	2023-04-16 07:01:24 +02:00