mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 23:54:52 +01:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
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 |