Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		2020-06-30 23:00:20 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
admin	…
concerns	…
import	Fix performance of follow import (#13836)	2020-06-09 10:26:58 +02:00
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
web	…
after_account_domain_block_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	Make domain block/silence/reject-media code more robust (#13424)	2020-06-09 10:32:00 +02:00
domain_clear_media_worker.rb	Make domain block/silence/reject-media code more robust (#13424)	2020-06-09 10:32:00 +02:00
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	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
mute_worker.rb	…
poll_expiration_notify_worker.rb	…
post_process_media_worker.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
publish_announcement_reaction_worker.rb	…
publish_scheduled_announcement_worker.rb	…
publish_scheduled_status_worker.rb	…
push_conversation_worker.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
push_encrypted_message_worker.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
push_update_worker.rb	…
redownload_media_worker.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
refollow_worker.rb	…
regeneration_worker.rb	…
removal_worker.rb	…
resolve_account_worker.rb	…
thread_resolve_worker.rb	…
unfavourite_worker.rb	…
unfollow_follow_worker.rb	…
unmerge_worker.rb	…
unpublish_announcement_worker.rb	…
verify_account_links_worker.rb	…