mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
392ca0472a
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| 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 | ||