mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 06:46:29 +00:00
b2526316f5
Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system. |
||
|---|---|---|
| .. | ||
| trends | ||
| accounts_statuses_cleanup_scheduler.rb | ||
| backup_cleanup_scheduler.rb | ||
| doorkeeper_cleanup_scheduler.rb | ||
| email_scheduler.rb | ||
| feed_cleanup_scheduler.rb | ||
| follow_recommendations_scheduler.rb | ||
| instance_refresh_scheduler.rb | ||
| ip_cleanup_scheduler.rb | ||
| media_cleanup_scheduler.rb | ||
| pghero_scheduler.rb | ||
| scheduled_statuses_scheduler.rb | ||
| user_cleanup_scheduler.rb | ||