mastodon/app/workers/activitypub
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
..
delivery_worker.rb
distribute_poll_update_worker.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01: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