summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-20 22:47:52 -0500
committerChris McDonough <chrism@plope.com>2012-11-20 22:47:52 -0500
commitc6a575052ae14e515c288e77a452440030c1cdcd (patch)
tree7bf6dc6f2b929e5a206aae6d751b0cda5d96aefd /docs/conf.py
parent8f4fcc47c9405f20cfed3a40931f12534b3b7193 (diff)
parentb5e4443dd28f3d4ed6e767e06d658838575d159e (diff)
downloadpyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.gz
pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.bz2
pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.zip
Merge branch 'master' into sontek-fix_commands
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 9bda4c798..5e17de18a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4a3'
+version = '1.4a4'
# The full version, including alpha/beta/rc tags.
release = version