summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-07-18 18:17:20 -0400
committerChris McDonough <chrism@plope.com>2013-07-18 18:17:20 -0400
commit0d96b77150f1283a44acd0d9c2d2f74453d298a1 (patch)
treec6b0064e60663f1b7149783cb91b0f539bd79977 /docs/conf.py
parent5028d84aeb6ac79ee7db4dc4012ff4caaba10e77 (diff)
downloadpyramid-0d96b77150f1283a44acd0d9c2d2f74453d298a1.tar.gz
pyramid-0d96b77150f1283a44acd0d9c2d2f74453d298a1.tar.bz2
pyramid-0d96b77150f1283a44acd0d9c2d2f74453d298a1.zip
version bump in setup.py conf.py CHANGES.txt, rejigger changes bugs vs. features
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 84b01a791..ff5f325d8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@ copyright = '2008-%s, Agendaless Consulting' % thisyear
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4'
+version = '1.5dev'
# The full version, including alpha/beta/rc tags.
release = version