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	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
concerns
import
pubsubhubbub
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-18 17:25:56 +02:00
web	Fix web push subscriptions being deleted on rate limit or timeout (#11826)	2019-09-13 19:15:47 +02:00
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	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
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	Add retry for failed media downloads and tootctl media refresh (#11775)	2019-09-10 15:29:12 +02:00
refollow_worker.rb
regeneration_worker.rb
remote_profile_update_worker.rb
removal_worker.rb	Add soft delete for statuses for instant deletes through API (#11623)	2019-08-22 21:55:56 +02:00
resolve_account_worker.rb
salmon_worker.rb
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
unmerge_worker.rb
verify_account_links_worker.rb