Merge branch 'develop' into 'reactions'

[akkoma] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f47f88de0c49fe1ca06eedad9b12e0336f0dbbf..c9b447d090311243fcf293e6533c0c440e2359a5 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 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>
 
 ### Fixed