From: Maksim Pechnikov <parallel588@gmail.com>
Date: Fri, 24 Jan 2020 18:46:57 +0000 (+0300)
Subject: Merge branch 'develop' into feature/tag_feed
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=055edd3d72504d3bfa8426b2fd90d49d97ad193b;p=akkoma

Merge branch 'develop' into feature/tag_feed
---

055edd3d72504d3bfa8426b2fd90d49d97ad193b
diff --cc CHANGELOG.md
index 506ce811e,4d626a683..513e9ce49
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -98,8 -99,7 +99,9 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Add `emoji_reactions` property to Statuses
  - Mastodon API: Change emoji reaction reply format
  - Notifications: Added `pleroma:emoji_reaction` notification type
+ - Mastodon API: Change emoji reaction reply format once more
 +- Configuration: `feed.logo` option for tag feed.
 +- Tag feed: `/tags/:tag.rss` - list public statuses by hashtag.
  </details>
  
  ### Fixed