summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-11-18 20:38:37 -0800
committerBen Bangert <ben@groovie.org>2010-11-18 20:38:37 -0800
commit41181f28409b49a15dc907b11b90c3c0f8e9275c (patch)
tree87136ba39d045b8dc1403d76e3e8ae184fee6888 /CHANGES.txt
parent4018adea20ee73cfeeaebb69e95e4b00dd5cf22e (diff)
parent29b7aabcb7b50024ead27cb5ff9cb47757ffe462 (diff)
downloadpyramid-41181f28409b49a15dc907b11b90c3c0f8e9275c.tar.gz
pyramid-41181f28409b49a15dc907b11b90c3c0f8e9275c.tar.bz2
pyramid-41181f28409b49a15dc907b11b90c3c0f8e9275c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8aff366a6..ed68770fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,8 @@ Features
- Make test suite pass on Jython (requires PasteScript trunk, presumably to
be 1.7.4).
+- Make test suite pass on PyPy (Chameleon doesn't work).
+
Bug Fixes
---------