From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 21 Jan 2020 17:56:49 +0000 (+0300)
Subject: Merge branch 'develop' into feature/tag_feed
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5ea859644897354dfea47655ce39dda46439040a;p=akkoma

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

5ea859644897354dfea47655ce39dda46439040a
diff --cc CHANGELOG.md
index 1f2271c70,09f31d5a9..327428138
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -94,8 -94,7 +94,9 @@@ The format is based on [Keep a Changelo
  - Captcha: Support native provider
  - 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
 +- Configuration: `feed.logo` option for tag feed.
 +- Tag feed: `/tags/:tag.rss` - list public statuses by hashtag.
  </details>
  
  ### Fixed