summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-29 13:36:07 -0500
committerChris McDonough <chrism@plope.com>2012-01-29 13:36:07 -0500
commitbfe8046689b9f9b4273df773a43be19080958193 (patch)
tree1fa043841e64fb861919febbcdfb94ea05fe1f4c /docs/conf.py
parent76363823a22a709a15b6895430b4eece67da3b39 (diff)
parent71c94c0ae7a36dab1b39585907d8a0c24d377c90 (diff)
downloadpyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.gz
pyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.bz2
pyramid-bfe8046689b9f9b4273df773a43be19080958193.zip
Merge branch '1.3-branch'
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 2ab56cadf..3496bd38c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -80,7 +80,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.3a5'
+version = '1.3a6'
# The full version, including alpha/beta/rc tags.
release = version