summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-14 16:32:34 +0000
committerlain <lain@soykaf.club>2020-04-14 16:32:34 +0000
commitc02e6ceea567b3ae7a5492ebd4d0babb798a13b4 (patch)
treebdabe459c11fd9ef2f79402c6a454c3ca04fb341 /CHANGELOG.md
parent3677a1e5785e8a753652debf37b2818e622f9ffd (diff)
parent4576520461e2e3a1c78133aaf31cb742a2a1a689 (diff)
downloadpleroma-c02e6ceea567b3ae7a5492ebd4d0babb798a13b4.tar.gz
pleroma-c02e6ceea567b3ae7a5492ebd4d0babb798a13b4.zip
Merge branch 'revert-60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'" See merge request pleroma/pleroma!2384
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f7fc1802..56b235f6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -123,7 +123,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mastodon API: `pleroma.thread_muted` to the Status entity
- Mastodon API: Mark the direct conversation as read for the author when they send a new direct message
- Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
-- Mastodon API: Add `pleroma.unread_count` to the Marker entity
- Admin API: Render whole status in grouped reports
- Mastodon API: User timelines will now respect blocks, unless you are getting the user timeline of somebody you blocked (which would be empty otherwise).
- Mastodon API: Favoriting / Repeating a post multiple times will now return the identical response every time. Before, executing that action twice would return an error ("already favorited") on the second try.