summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2010-10-17 16:43:07 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2010-10-17 16:43:07 +0200
commit44e1f567a621ecd697373c6c708e90c3171ec2b6 (patch)
treec88412de377317d47dc21a05d218d22debed1eca
parent99d70bd309921af81aae8849556ffdcbabd99556 (diff)
downloadjinja2-44e1f567a621ecd697373c6c708e90c3171ec2b6.tar.gz
master will be 2.6
-rw-r--r--CHANGES4
-rw-r--r--setup.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index cbeefa7..7e6c906 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
Jinja2 Changelog
================
+Version 2.6
+-----------
+(codename to be selected, release date to be announced)
+
Version 2.5.4
-------------
(bugfix release, release date to be announced)
diff --git a/setup.py b/setup.py
index e50ffa9..856ec5b 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ else:
setup(
name='Jinja2',
- version='2.5.4',
+ version='2.6',
url='http://jinja.pocoo.org/',
license='BSD',
author='Armin Ronacher',