4aa6aba6ee
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
concerns | ||
import | ||
maintenance | ||
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 | ||
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 | ||
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 |