Merge branch 'develop' into feature/tag_feed

diff --cc CHANGELOG.md
index 32742813814ae6b5e898392d4f254dc295f9b8d5,3f691463894dee8c889cd96fbb8b329a70df96a9..14952ffc426c998b1dc34b64eba726f429c5f4c2
--- 1/CHANGELOG.md
--- 2/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

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