summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-07-14 22:22:15 -0500
committerMichael Merickel <michael@merickel.org>2013-07-14 22:22:15 -0500
commit6b97003b5cfc8e318eb0cb789569d3604b3821f3 (patch)
treec4d739f9b5fab1d39df1460b34d1317c1c26f611 /CHANGES.txt
parent6c38039e37cf134615e773968644686fdc5012a6 (diff)
downloadpyramid-6b97003b5cfc8e318eb0cb789569d3604b3821f3.tar.gz
pyramid-6b97003b5cfc8e318eb0cb789569d3604b3821f3.tar.bz2
pyramid-6b97003b5cfc8e318eb0cb789569d3604b3821f3.zip
update changlog
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0156b24fd..2221f9945 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -101,7 +101,8 @@ Bug Fixes
predicate mismatch error when trying to use GET or DELETE
methods. Now the views are found and no predicate mismatch is
raised.
- See https://github.com/Pylons/pyramid/pull/786
+ See https://github.com/Pylons/pyramid/pull/786 and
+ https://github.com/Pylons/pyramid/pull/1004
- Spaces and dots may now be in mako renderer template paths. This was
broken when support for the new makodef syntax was added in 1.4a1.