summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-14 02:50:53 -0500
committerChris McDonough <chrism@plope.com>2012-11-14 02:50:53 -0500
commit3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb (patch)
tree03006b197b63358eb65bfaa8bacaec614b6ec7d0 /docs/conf.py
parent39ef68dbc196824f66796fa91ea1eeeaa96d7471 (diff)
parent948068688561806a321a17bfc15c87446a577b5b (diff)
downloadpyramid-3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb.tar.gz
pyramid-3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb.tar.bz2
pyramid-3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb.zip
Merge branch '1.4-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 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