Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.

diff --cc app/controllers/settings/exports_controller.rb
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/services/post_status_service.rb
index 8a9d26c5629f25b3915f2ec2ce8140a00f4744a7,a1705a6adcfee42499e08244ca9c39a1c58d5836..b9952369d89089a0d629f241f415d2243f6577e3
--- 1/app/services/post_status_service.rb
--- 2/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@@ -91,10 -88,9 +91,13 @@@ class PostStatusService < BaseServic
    def postprocess_status!
      LinkCrawlWorker.perform_async(@status.id) unless @status.spoiler_text?
      DistributionWorker.perform_async(@status.id)
 -    Pubsubhubbub::DistributionWorker.perform_async(@status.stream_entry.id)
 -    ActivityPub::DistributionWorker.perform_async(@status.id)
++
 +    unless @status.local_only?
 +      Pubsubhubbub::DistributionWorker.perform_async(@status.stream_entry.id)
 +      ActivityPub::DistributionWorker.perform_async(@status.id)
 +    end
++
+     PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll
    end
  
    def validate_media!

diff --cc streaming/index.js
Simple merge