Merge branch 'develop' into 'reactions'

# Conflicts: # CHANGELOG.md
2019-11-10 11:32:50 +00:00 · 2019-11-10 11:32:50 +00:00 · a88e834dba
commit a88e834dba
parent b22ee9d966 3a1aaadc18
30 changed files with 780 additions and 719 deletions
--- 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