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.

Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
backup_cleanup_scheduler.rb	…
doorkeeper_cleanup_scheduler.rb	…
email_scheduler.rb	…
feed_cleanup_scheduler.rb	…
ip_cleanup_scheduler.rb	…
media_cleanup_scheduler.rb	…
pghero_scheduler.rb	…
preview_cards_cleanup_scheduler.rb	…
scheduled_statuses_scheduler.rb	…
subscriptions_cleanup_scheduler.rb	…
subscriptions_scheduler.rb	…
user_cleanup_scheduler.rb	…