From: lain <lain@soykaf.club>
Date: Sun, 10 Nov 2019 11:32:50 +0000 (+0000)
Subject: Merge branch 'develop' into 'reactions'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a88e834dbadcd3485a6187d512865ab95bb9c1f0;p=akkoma

Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md
---

a88e834dbadcd3485a6187d512865ab95bb9c1f0
diff --cc CHANGELOG.md
index 4f47f88de,1eb7d14cd..c9b447d09
--- a/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