Merge branch 'develop' into feature/tag_feed

diff --cc CHANGELOG.md
index 506ce811e51287df6ae30f0f2a599dd19c8ed9a6,4d626a6836e4660592b266e194a7f0aec979ccf5..513e9ce49fd364973a3ee6b2b6ebfa465747af49
--- 1/CHANGELOG.md
--- 2/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