From 23b7a2a8423a56928e99953bcc41ce281b1ae6be Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Tue, 16 Aug 2016 18:11:09 -0500
Subject: Fix #2744 by reverting #2706

This reverts commit c7d8f6515d4b154c4a4cf2cbaac9789fbcd19282.
This reverts commit 0dcd259c0263c14e8c51d9e204c1419daffbd2ce.
This reverts commit 412ed2e1988e2fd70d02e4176c9c9c7855b0093c.
---
 CHANGES.txt | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'CHANGES.txt')

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