Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.		2020-12-10 09:41:49 +01:00
..
challenges	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
confirmations	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
passwords	Add client-side validation in password change forms (#14564)	2020-08-12 12:11:15 +02:00
registrations	Add honeypot fields and minimum fill-out time for sign-up form (#15276)	2020-12-10 06:27:26 +01:00
sessions	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-05 17:33:37 +01:00
setup	Change account deletion page to have better explanations (#11753)	2019-09-04 04:13:54 +02:00
shared	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00