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

[akkoma] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a92607932acc39c5107f91612742effe02b0a88..8658d544099f7bae38c731b891ba59870b0aa502 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - 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