From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Fri, 10 Jul 2020 08:55:15 +0000 (+0000)
Subject: Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4ac6e6283f6e090588ad56066b1e552b895f3a24;p=akkoma

Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'

# Conflicts:
#   CHANGELOG.md
---

4ac6e6283f6e090588ad56066b1e552b895f3a24
diff --cc CHANGELOG.md
index c713f1970,2e914e776..78eb8e984
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -79,7 -81,7 +81,8 @@@ The format is based on [Keep a Changelo
  - `blob:` urls not being allowed by connect-src CSP
  - Mastodon API: fix `GET /api/v1/notifications` not returning the full result set
  - Rich Media Previews for Twitter links
 +- Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
+ - Fix CSP policy generation to include remote Captcha services
  
  ## [Unreleased (patch)]