Merge branch 'develop' into feature/tag_feed
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 21 Jan 2020 17:56:49 +0000 (20:56 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 21 Jan 2020 17:56:49 +0000 (20:56 +0300)
1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
index 1f2271c7027acd57a0a89bf50cba4342bc55ab58,09f31d5a9a8b8be287b498959f1d0404e73c34bc..32742813814ae6b5e898392d4f254dc295f9b8d5
@@@ -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