Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb

2019-06-07 17:00:36 +02:00

..

delivery_worker.rb

…

distribute_poll_update_worker.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-07 17:00:36 +02:00

distribution_worker.rb

…

fetch_replies_worker.rb

…

low_priority_delivery_worker.rb

…

post_upgrade_worker.rb

…

processing_worker.rb

…

raw_distribution_worker.rb

…

reply_distribution_worker.rb

…

synchronize_featured_collection_worker.rb

…

update_distribution_worker.rb

…