From: Maksim Pechnikov <parallel588@gmail.com>
Date: Thu, 23 Jan 2020 08:42:10 +0000 (+0300)
Subject: Merge branch 'develop' into feature/tag_feed
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2cfe1b93854c117fda19e54ea17c99f72413a569;p=akkoma

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

2cfe1b93854c117fda19e54ea17c99f72413a569
diff --cc CHANGELOG.md
index 327428138,3f6914638..14952ffc4
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -95,8 -95,8 +95,10 @@@ The format is based on [Keep a Changelo
  - Captcha: Enable by default
  - Mastodon API: Add support for `account_id` param to filter notifications by the account
  - Mastodon API: Add `emoji_reactions` property to Statuses
+ - Mastodon API: Change emoji reaction reply format
+ - Notifications: Added `pleroma:emoji_reaction` notification type
 +- Configuration: `feed.logo` option for tag feed.
 +- Tag feed: `/tags/:tag.rss` - list public statuses by hashtag.
  </details>
  
  ### Fixed