aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-07-10 16:38:05 +0000
committerfeld <feld@feld.me>2020-07-10 16:38:05 +0000
commit76f5f617138300cbc8c552d1bfb7bbfb9a5178b2 (patch)
tree53d65da0cf6666fc70b68bee662395481dcf9acb
parentce9514000db1e08a69b8874f21e66261b9261d86 (diff)
parent0517d3252e7684ec44a892c66372a706fe220f30 (diff)
downloadpleroma-76f5f617138300cbc8c552d1bfb7bbfb9a5178b2.tar.gz
Merge branch 'chore/should-document-that' into 'develop'
Probably worth documenting the MediaProxy fix See merge request pleroma/pleroma!2750
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c005a4dc..9e928528a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- 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
+- Fix edge case where MediaProxy truncates media, usually caused when Caddy is serving content for the other Federated instance.
## [Unreleased (patch)]