Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
delivery_worker.rb
distribute_poll_update_worker.rb
distribution_worker.rb
fetch_replies_worker.rb
low_priority_delivery_worker.rb
move_distribution_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