mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 04:39:23 +00:00
f1a6f9062e
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`. |
||
---|---|---|
.. | ||
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 | ||
update_distribution_worker.rb |