Merge branch 'develop' into 'hide-muted-reactions'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 33ff9a9f0bed72c95ac7b0d869c67796566c0796,cd90562c29fed5c35dc4933d2a8626ef32a2878a..8658d544099f7bae38c731b891ba59870b0aa502
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -45,7 -51,7 +51,8 @@@ The format is based on [Keep a Changelo
  
  - Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`.
  - S3 Uploads with Elixir 1.11.
 +- Fixed Emoji Reaction activity filtering from blocked and muted accounts
+ - Mix task pleroma.user delete_activities for source installations.
  
  ## [2.2.0] - 2020-11-12
  

diff --cc lib/pleroma/user.ex
Simple merge