From dc9c386fb762defd97313cb6261fcd95f7321e71 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 16 May 2014 21:54:40 -0500
Subject: update changelog

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'CHANGES.txt')

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
 ----
 
-- 
cgit v1.2.3