Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		2020-12-05 17:33:37 +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	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02: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