mirror of https://github.com/tootsuite/mastodon
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
|---|---|---|
| .. | ||
| 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 | ||
| scheduled_statuses_scheduler.rb | ||
| subscriptions_cleanup_scheduler.rb | ||
| subscriptions_scheduler.rb | ||
| trending_tags_scheduler.rb | ||
| user_cleanup_scheduler.rb | ||