summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-02 03:12:44 -0500
committerChris McDonough <chrism@plope.com>2012-03-02 03:12:44 -0500
commitf5a1a3cf957001ee338ee02502a1a0654fb694ca (patch)
tree1c1af377555cf8d03612b4a826cc5b8783969fc1 /docs/conf.py
parent8114e3a023aa2c37e99acddfe4e697ee5cc180ed (diff)
parent3a14206e0f03fe24fa9a6611097230607332184d (diff)
downloadpyramid-f5a1a3cf957001ee338ee02502a1a0654fb694ca.tar.gz
pyramid-f5a1a3cf957001ee338ee02502a1a0654fb694ca.tar.bz2
pyramid-f5a1a3cf957001ee338ee02502a1a0654fb694ca.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 187b1a125..1c957162e 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.3b1'
+version = '1.3b2'
# The full version, including alpha/beta/rc tags.
release = version