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

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index c713f19704737fc3fdc78a44e99d1ede3a28386f,2e914e7763be1da18e82265d9288fa42011ceee8..78eb8e984f43bb4616e303642564cfbf661e96af
--- 1/CHANGELOG.md
--- 2/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)]