Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

2019-11-07 13:43:56 +01:00

..

activitypub

…

admin

…

concerns

…

import

…

pubsubhubbub

…

scheduler

…

web

…

after_account_domain_block_worker.rb

…

after_remote_follow_request_worker.rb

…

after_remote_follow_worker.rb

…

authorize_follow_worker.rb

…

backup_worker.rb

…

block_worker.rb

…

bootstrap_timeline_worker.rb

…

digest_mailer_worker.rb

…

distribution_worker.rb

…

domain_block_worker.rb

…

feed_insert_worker.rb

…

fetch_reply_worker.rb

…

import_worker.rb

…

link_crawl_worker.rb

…

local_notification_worker.rb

…

merge_worker.rb

…

move_worker.rb

…

mute_worker.rb

…

notification_worker.rb

…

poll_expiration_notify_worker.rb

…

processing_worker.rb

…

publish_scheduled_status_worker.rb

…

push_conversation_worker.rb

…

push_update_worker.rb

…

redownload_media_worker.rb

…

refollow_worker.rb

…

regeneration_worker.rb

…

remote_profile_update_worker.rb

…

removal_worker.rb

…

resolve_account_worker.rb

…

salmon_worker.rb

…

thread_resolve_worker.rb

…

unfavourite_worker.rb

…

unfollow_follow_worker.rb

…

unmerge_worker.rb

…

verify_account_links_worker.rb

…