You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire e590177b29 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		4 years ago
..
challenges	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
confirmations	Change unconfirmed user login behaviour (#11375)	5 years ago
passwords	Add client-side validation in password change forms (#14564)	4 years ago
registrations	Add ability to require invite request text (#15326)	4 years ago
sessions	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
setup	Change account deletion page to have better explanations (#11753)	5 years ago
shared	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago