This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +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	…
post_process_media_worker.rb	…
processing_worker.rb	…
publish_announcement_reaction_worker.rb	…
publish_scheduled_announcement_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	…
unpublish_announcement_worker.rb	…
verify_account_links_worker.rb	…