summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-11-20 18:40:15 +0000
committerfeld <feld@feld.me>2020-11-20 18:40:15 +0000
commitecd1ef8cb5afa16dba5158e9e278a18c0856ca3e (patch)
treee4d6af5f6055491ad244952cd87fc488d3a8c2f2 /CHANGELOG.md
parentd8924e1a56d51ac67d4cca6f9efb57fae33bbed4 (diff)
parent46dab37351994567ddb3a8a6fe654355175fe654 (diff)
downloadpleroma-ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e.tar.gz
pleroma-ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e.zip
Merge branch 'fix/2302-report-duplicates' into 'develop'
Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe9b2b4d1..281f06729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,8 +47,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Changed
-- Fix ability to update Pleroma Chat push notifications with PUT /api/v1/push/subscription and alert type pleroma:chat_mention
-
### Fixed
- Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`.
@@ -56,6 +54,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- S3 Uploads with Elixir 1.11.
- Emoji Reaction activity filtering from blocked and muted accounts.
- Mix task pleroma.user delete_activities for source installations.
+- Fix ability to update Pleroma Chat push notifications with PUT /api/v1/push/subscription and alert type pleroma:chat_mention
+- Forwarded reports duplication from Pleroma instances.
+
+<details>
+ <summary>API</summary>
+- Statuses were not displayed for Mastodon forwarded reports.
+
+</details>
## [2.2.0] - 2020-11-12