mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 06:06:49 +00:00
444796b69b
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 |
||
---|---|---|
.. | ||
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 |