Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 4f47f88de0c49fe1ca06eedad9b12e0336f0dbbf,1eb7d14cde2dcc10d0f25b79a89fa08a325fdfcb..c9b447d090311243fcf293e6533c0c440e2359a5
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -59,7 -58,7 +59,9 @@@ The format is based on [Keep a Changelo
  - 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>
  
  ### Fixed

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge