summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-25 21:27:09 -0400
committerChris McDonough <chrism@plope.com>2014-05-25 21:27:09 -0400
commit52e4b59f7264adc373bff4d1a96fd489991ecf8b (patch)
tree2e300de4c8adebc67ac1c26bdef9250abe82e28c /CHANGES.txt
parenta978083b5719faf13e2ccf98ae93d5b03ec0d7cb (diff)
parentc79c2d9f36f27abfa5e2a72e021298728734138d (diff)
downloadpyramid-52e4b59f7264adc373bff4d1a96fd489991ecf8b.tar.gz
pyramid-52e4b59f7264adc373bff4d1a96fd489991ecf8b.tar.bz2
pyramid-52e4b59f7264adc373bff4d1a96fd489991ecf8b.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-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
----