From: minibikini <egor@kislitsyn.com>
Date: Wed, 18 Nov 2020 20:22:40 +0000 (+0000)
Subject: Merge branch 'develop' into 'hide-muted-reactions'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6669ac5bf7749be325a10f92cc9eed49c6be2761;p=akkoma

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

# Conflicts:
#   CHANGELOG.md
---

6669ac5bf7749be325a10f92cc9eed49c6be2761
diff --cc CHANGELOG.md
index 33ff9a9f0,cd90562c2..8658d5440
--- a/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