summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-19 10:58:28 +0000
committerlain <lain@soykaf.club>2020-11-19 10:58:28 +0000
commit6f9b03384fe50ce063e8fee3103a69dff298107b (patch)
tree65d3590323dabb4f59b0f9e1eb5ddcbeca9a1e2e /CHANGELOG.md
parent8a7ee9fe74f64680da366b0da51038bed022061b (diff)
parent6669ac5bf7749be325a10f92cc9eed49c6be2761 (diff)
downloadpleroma-6f9b03384fe50ce063e8fee3103a69dff298107b.tar.gz
pleroma-6f9b03384fe50ce063e8fee3103a69dff298107b.zip
Merge branch 'hide-muted-reactions' into 'develop'
Hide reactions from muted and blocked users Closes #1875 See merge request pleroma/pleroma!3147
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd90562c2..8658d5440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ 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