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
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
views	Fix performance on instances list in admin UI (#15282)	4 years ago
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
seeds.rb	Change unconfirmed user login behaviour (#11375)	5 years ago