From 1ef35b7194ad744f23cf2881bbf881690d680c83 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 6 Feb 2015 01:04:17 -0600
Subject: update changelog

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 22c7a20c2..9b0ee90e9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -120,6 +120,11 @@ Bug Fixes
 - Fix route generation for static view asset specifications having no path.
   See https://github.com/Pylons/pyramid/pull/1377
 
+- Allow the ``pyramid.renderers.JSONP`` renderer to work even if there is no
+  valid request object. In this case it will not wrap the object in a
+  callback and thus behave just like the ``pyramid.renderers.JSON` renderer.
+  See https://github.com/Pylons/pyramid/pull/1561
+
 Deprecations
 ------------
 
-- 
cgit v1.2.3