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.		2020-12-15 14:27:06 +01:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
views	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00