From: lain <lain@soykaf.club>
Date: Wed, 15 Jan 2020 14:29:56 +0000 (+0000)
Subject: Merge branch 'develop' into 'feature/tag_feed'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=aa9fe3a712ac14dd2ee3227e6066bd3c47e9a5f3;p=akkoma

Merge branch 'develop' into 'feature/tag_feed'

# Conflicts:
#   CHANGELOG.md
---

aa9fe3a712ac14dd2ee3227e6066bd3c47e9a5f3
diff --cc CHANGELOG.md
index e864cd88d,33252ad3d..512337a04
--- a/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