Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

delivery_worker.rb

…

distribute_poll_update_worker.rb

…

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

…