summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-07-15 21:44:01 -0500
committerMichael Merickel <michael@merickel.org>2013-07-15 21:44:01 -0500
commit75fc4ac60ed4217cfaed4145656b7cefdc05cb04 (patch)
tree924a201c5438e316cb8fa2677852ff834c356179
parentab457f8d7d763ffb4d8c962d7cfe8328c62d390b (diff)
downloadpyramid-75fc4ac60ed4217cfaed4145656b7cefdc05cb04.tar.gz
pyramid-75fc4ac60ed4217cfaed4145656b7cefdc05cb04.tar.bz2
pyramid-75fc4ac60ed4217cfaed4145656b7cefdc05cb04.zip
update changelog
-rw-r--r--CHANGES.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 2221f9945..0dff0f047 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -102,7 +102,8 @@ Bug Fixes
methods. Now the views are found and no predicate mismatch is
raised.
See https://github.com/Pylons/pyramid/pull/786 and
- https://github.com/Pylons/pyramid/pull/1004
+ https://github.com/Pylons/pyramid/pull/1004 and
+ https://github.com/Pylons/pyramid/pull/1046
- 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.