summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-01-02 12:18:59 -0500
committerChris McDonough <chrism@plope.com>2014-01-02 12:18:59 -0500
commit0c5bb0aa329239df877ccb053280e398766eb434 (patch)
tree4a0cfd40e56a3a3514018cf3248f6d2177962bbc /CHANGES.txt
parent6b0d6ff01277993660049e3c289126ffb309c8dd (diff)
parent3687465ab87b82b83b7ffa2f216425136d71ebec (diff)
downloadpyramid-0c5bb0aa329239df877ccb053280e398766eb434.tar.gz
pyramid-0c5bb0aa329239df877ccb053280e398766eb434.tar.bz2
pyramid-0c5bb0aa329239df877ccb053280e398766eb434.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b7e47f0e5..9d877c0ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Next release
Bug Fixes
---------
+- Depend on a newer version of WebOb so that we pull in some crucial bug-fixes
+ that were showstoppers for functionality in Pyramid.
+
- Add a trailing semicolon to the JSONP response. This fixes JavaScript syntax
errors for old IE versions. See https://github.com/Pylons/pyramid/pull/1205