summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-08-16 18:11:09 -0500
committerMichael Merickel <michael@merickel.org>2016-08-16 19:44:29 -0500
commit23b7a2a8423a56928e99953bcc41ce281b1ae6be (patch)
treef587fa36310ebb318e1918d2e4f756e8070d58de /CHANGES.txt
parent93770d015c0de094bd308e5097ed94fe28b3ce7f (diff)
downloadpyramid-23b7a2a8423a56928e99953bcc41ce281b1ae6be.tar.gz
pyramid-23b7a2a8423a56928e99953bcc41ce281b1ae6be.tar.bz2
pyramid-23b7a2a8423a56928e99953bcc41ce281b1ae6be.zip
Fix #2744 by reverting #2706
This reverts commit c7d8f6515d4b154c4a4cf2cbaac9789fbcd19282. This reverts commit 0dcd259c0263c14e8c51d9e204c1419daffbd2ce. This reverts commit 412ed2e1988e2fd70d02e4176c9c9c7855b0093c.
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt5
1 files changed, 0 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8cb4c602e..02e3271ce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,11 +24,6 @@ Bug Fixes
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
------------