mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-13 17:06:22 +00:00
c56a504d11
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes. |
||
---|---|---|
.. | ||
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 |