You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
delivery_worker.rb	…
distribute_poll_update_worker.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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	…