summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorDariusz Górecki <darek.krk@gmail.com>2016-08-10 11:10:49 +0100
committerDariusz Górecki <darek.krk@gmail.com>2016-08-10 11:10:49 +0100
commitf2f196db97462d5d19253d261cb2167fd19c1108 (patch)
tree8f14e42096c343b57d4ccae486dea0309bad4b49 /CHANGES.txt
parentc0ddbc37530042119539b60245e2e2a4fccc83c0 (diff)
parenta69db3dc7c57f318308434905ee96e23d0c0d3df (diff)
downloadpyramid-f2f196db97462d5d19253d261cb2167fd19c1108.tar.gz
pyramid-f2f196db97462d5d19253d261cb2167fd19c1108.tar.bz2
pyramid-f2f196db97462d5d19253d261cb2167fd19c1108.zip
Merge branch 'master' into extract_http_basic
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 3e659ee9a..8cb4c602e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,10 +19,15 @@ Features
Bug Fixes
---------
+
- Fixed bug in `proutes` such that it now shows the correct view when a class
and `attr` is involved.
See: https://github.com/Pylons/pyramid/pull/2687
+- The JSON renderers now encode their result as UTF-8. The renderer helper
+ will now warn the user and encode the result as UTF-8 if a renderer returns a
+ text type and the response does not have a valid character set. See
+ https://github.com/Pylons/pyramid/pull/2706
Deprecations
------------
@@ -30,4 +35,4 @@ Deprecations
Documentation Changes
---------------------
- Updated Windows installation instructions and related bits.
- See: https://github.com/Pylons/pyramid/issues/2661 \ No newline at end of file
+ See: https://github.com/Pylons/pyramid/issues/2661