summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-19 11:26:55 -0400
committerChris McDonough <chrism@plope.com>2012-08-19 11:26:55 -0400
commitdbc792498c1c8a3390c1babc1bf742def40e2b46 (patch)
treec77ad9d16285eac24701e2123d2fd417cf39cc90
parentae18bc240966608097e25cb08614ead1667d7af8 (diff)
downloadpyramid-dbc792498c1c8a3390c1babc1bf742def40e2b46.tar.gz
pyramid-dbc792498c1c8a3390c1babc1bf742def40e2b46.tar.bz2
pyramid-dbc792498c1c8a3390c1babc1bf742def40e2b46.zip
Garden.
-rw-r--r--CHANGES.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index a9dd18985..abd30c950 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,12 +17,15 @@ Bug Fixes
during iteration`` exception. It no longer does. See
https://github.com/Pylons/pyramid/issues/635 for more information.
-- In Mako Templates lookup, check if the uri is already adjusted and bring
+- In Mako Templates lookup, cyheck 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
+- ``pserve``: don't show --stop-daemon option on Windows.
+ https://github.com/Pylons/pyramid/pull/661
+
Features
--------