summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-26 17:05:12 -0500
committerChris McDonough <chrism@plope.com>2012-02-26 17:05:12 -0500
commit648c557b0327a2384d479d668ecb7c42317d892a (patch)
tree70e47af1285f5449a230ccd3fe358687a73d5a27 /docs/conf.py
parentefde1442ca30428818309e1db7925317a6cebe49 (diff)
parentcf973d67fcae67f517d407a3f1bc3cb191def5b6 (diff)
downloadpyramid-648c557b0327a2384d479d668ecb7c42317d892a.tar.gz
pyramid-648c557b0327a2384d479d668ecb7c42317d892a.tar.bz2
pyramid-648c557b0327a2384d479d668ecb7c42317d892a.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 79d9946ad..187b1a125 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.3a9'
+version = '1.3b1'
# The full version, including alpha/beta/rc tags.
release = version