From: feld <feld@feld.me>
Date: Fri, 4 Oct 2019 14:16:28 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=31e57cd1b34798afb07a8de4c0c95ef3c15e22ed;p=akkoma

Merge branch 'develop' into 'fix/extended-nickname-format-default-config'

# Conflicts:
#   CHANGELOG.md
---

31e57cd1b34798afb07a8de4c0c95ef3c15e22ed
diff --cc CHANGELOG.md
index c22995b82,6ebc46b7d..d2f945004
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -23,7 -24,7 +24,8 @@@ The format is based on [Keep a Changelo
  
  ### Fixed
  - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
+ - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
 +- Added `:instance, extended_nickname_format` setting to the default config
  
  ## [1.1.0] - 2019-??-??
  ### Security