mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-05 04:29:03 +01:00
93912f0498
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting. |
||
---|---|---|
.. | ||
account_raw_distribution_worker.rb | ||
delivery_worker.rb | ||
distribute_poll_update_worker.rb | ||
distribution_worker.rb | ||
fetch_replies_worker.rb | ||
followers_synchronization_worker.rb | ||
low_priority_delivery_worker.rb | ||
move_distribution_worker.rb | ||
post_upgrade_worker.rb | ||
processing_worker.rb | ||
raw_distribution_worker.rb | ||
status_update_distribution_worker.rb | ||
synchronize_featured_collection_worker.rb | ||
synchronize_featured_tags_collection_worker.rb | ||
update_distribution_worker.rb |