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

diff --cc CHANGELOG.md
index 4b74d064c886f168b2c32c3b061874ef3a4e6ca0,0f34470699c9dd871c684b9e6c84404e438fa774..2e914e7763be1da18e82265d9288fa42011ceee8
--- 1/CHANGELOG.md
--- 2/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)]