From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 9 Jul 2020 14:08:59 +0000 (-0500)
Subject: Merge branch 'develop' into fix/csp-for-captcha
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=49c4e2495357797caa82b4eb0a4d03e8c8dd2730;p=akkoma

Merge branch 'develop' into fix/csp-for-captcha
---

49c4e2495357797caa82b4eb0a4d03e8c8dd2730
diff --cc CHANGELOG.md
index 4b74d064c,0f3447069..2e914e776
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -73,7 -80,7 +80,8 @@@ The format is based on [Keep a Changelo
  - Resolving Peertube accounts with Webfinger
  - `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
 +- Fix CSP policy generation to include remote Captcha services
  
  ## [Unreleased (patch)]