summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCodeMan99 <cody.taylor@maternityneighborhood.com>2014-12-11 09:43:51 -0500
committerCodeMan99 <cody.taylor@maternityneighborhood.com>2014-12-11 09:43:51 -0500
commitd1c4a552bc10973499fdcc923bd4a37b35e79bdd (patch)
treed75ed06250c8381041d412dfc2b3ba1bc58ed313
parent753ad3caa20523ddc8ad9db367f724a0c34f5f96 (diff)
parent82c5aaec36f316a73fb1ec2dfac0f686b023d63c (diff)
downloadmako-d1c4a552bc10973499fdcc923bd4a37b35e79bdd.tar.gz
Merge branch 'master' of bitbucket.org:CodeMan99/mako
-rw-r--r--doc/build/changelog.rst10
-rw-r--r--mako/__init__.py2
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 9f0e9f2..35d1237 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -6,6 +6,16 @@ Changelog
===
.. changelog::
+ :version: 1.0.1
+
+ .. change::
+ :tags: bug, py3k
+ :pullreq: bitbucket:11
+
+ Modernized the examples/wsgi/run_wsgi.py file for Py3k.
+ Pull requset courtesy Cody Taylor.
+
+.. changelog::
:version: 1.0.0
:released: Sun Jun 8 2014
diff --git a/mako/__init__.py b/mako/__init__.py
index 52a1c05..c8c18e8 100644
--- a/mako/__init__.py
+++ b/mako/__init__.py
@@ -5,7 +5,7 @@
# the MIT License: http://www.opensource.org/licenses/mit-license.php
-__version__ = '1.0.0'
+__version__ = '1.0.1'