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
..
backup_cleanup_scheduler.rb	…
doorkeeper_cleanup_scheduler.rb	…
email_scheduler.rb	…
feed_cleanup_scheduler.rb	…
instance_refresh_scheduler.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
ip_cleanup_scheduler.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
media_cleanup_scheduler.rb	…
pghero_scheduler.rb	…
scheduled_statuses_scheduler.rb	…
trending_tags_scheduler.rb	…
user_cleanup_scheduler.rb	…