Claire e4f8679eae 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.		2020-12-15 14:27:06 +01:00
..
challenges	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
confirmations
passwords	Add client-side validation in password change forms (#14564)	2020-08-12 12:11:15 +02:00
registrations	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
sessions	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-05 17:33:37 +01:00
setup
shared	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00