summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-05-16 21:54:40 -0500
committerMichael Merickel <michael@merickel.org>2014-05-16 21:54:40 -0500
commitdc9c386fb762defd97313cb6261fcd95f7321e71 (patch)
tree0f32708dd6839b367f5458a7e6e4fad99bfc9aa8
parent50d6aab55ba43e8a8921ce96959eb2ccd67b60ed (diff)
downloadpyramid-dc9c386fb762defd97313cb6261fcd95f7321e71.tar.gz
pyramid-dc9c386fb762defd97313cb6261fcd95f7321e71.tar.bz2
pyramid-dc9c386fb762defd97313cb6261fcd95f7321e71.zip
update changelog
-rw-r--r--CHANGES.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0c461e550..e60c6efac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,9 @@ Bug Fixes
using the returned ``Configurator`` during testing. There is now a
``package`` argument that can override this behavior as well.
+- Fix an issue where a ``pyramid.response.FileResponse`` may apply a charset
+ where it does not belong. See https://github.com/Pylons/pyramid/pull/1251
+
Docs
----