summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaise Laflamme <blaise@laflamme.org>2012-08-22 10:49:18 -0400
committerBlaise Laflamme <blaise@laflamme.org>2012-08-22 10:49:18 -0400
commit7853bc001283db8c5b87d026dcc130d1bece8dcc (patch)
tree0ef90792061b59f2433cceacde5b9bc428d751eb
parent909dfee23c43709f2aa07942fb633cc740a9a6b3 (diff)
downloadpyramid-7853bc001283db8c5b87d026dcc130d1bece8dcc.tar.gz
pyramid-7853bc001283db8c5b87d026dcc130d1bece8dcc.tar.bz2
pyramid-7853bc001283db8c5b87d026dcc130d1bece8dcc.zip
garden
-rw-r--r--CHANGES.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0291d924a..30df788b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,12 +17,16 @@ Bug Fixes
during iteration`` exception. It no longer does. See
https://github.com/Pylons/pyramid/issues/635 for more information.
-- In Mako Templates lookup, cyheck if the uri is already adjusted and bring
+- In Mako Templates lookup, check if the uri is already adjusted and bring
it back to an asset spec. Normally occurs with inherited templates or
included components.
https://github.com/Pylons/pyramid/issues/606
https://github.com/Pylons/pyramid/issues/607
+- In Mako Templates lookup, check for absolute uri (using mako directories)
+ when mixing up inheritance with asset specs.
+ https://github.com/Pylons/pyramid/issues/662
+
Features
--------