Merge branch 'develop' into 'feature/tag_feed'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index e864cd88de473ab2a86ec70168f497f725e39823,33252ad3dd0afcb28c6a296f09bdcc9fa95a4fc1..512337a04cfca45a8065f559c7bd5c5816ad3285
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -90,8 -90,7 +90,9 @@@ The format is based on [Keep a Changelo
  - Mastodon API: `/api/v1/update_credentials` accepts `actor_type` field.
  - Captcha: Support native provider
  - Captcha: Enable by default
+ - Mastodon API: Add support for `account_id` param to filter notifications by the account
 +- Configuration: `feed.logo` option for tag feed.
 +- Tag feed: `/tags/:tag.rss` - list public statuses by hashtag.
  </details>
  
  ### Fixed