summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-23 16:00:16 +0000
committerAlex Gleason <alex@alexgleason.me>2021-12-23 16:00:16 +0000
commitd9746ae4cba32f7544edb776f77134be4141ba2c (patch)
tree1a36cf2ff5f99046f5d95e45a63bf5c8f96a3060 /CHANGELOG.md
parent05c7a141016cc7709357922842c7f9fb88c5b9aa (diff)
parent8376e83f61b8dbe61134e814e093e8fe7288440f (diff)
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
Handle Reject for already-accepted Follows properly Closes #2766 and #2802 See merge request pleroma/pleroma!3568
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 07d6d1934..8e97da189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
- Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies
+- Handle Reject for already-accepted Follows properly
### Removed