summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-11-14 08:21:06 +0000
committerlain <lain@soykaf.club>2019-11-14 08:21:06 +0000
commit7a322713c33e8ef2fdc326f9e35d1fcbe7590c93 (patch)
tree4ceb82291d67fa0c40962aa4cddcaccc8b0d911a
parenta88e834dbadcd3485a6187d512865ab95bb9c1f0 (diff)
Update CHANGELOG.md
-rw-r--r--CHANGELOG.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9b447d09..0464f4571 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,7 +59,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all conversations as read
- Mastodon API: Add `/api/v1/markers` for managing timeline read markers
- Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
-- Pleroma API: Add Emoji reactions
- Configuration: `feed` option for user atom feed.
- Pleroma API: Add Emoji reactions
</details>