summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-12-10 21:45:27 -0500
committerChris McDonough <chrism@plope.com>2012-12-10 21:45:27 -0500
commit60eb090f768f48ff70b38e1846b0a6612e597f5a (patch)
tree881b11b4861a1d261cdfb4522298eebd913396d3 /docs
parentecc2bd253e56e6a15a80f593bd193653211c9b49 (diff)
parente609e19d028b1d714439188812ca3c9811e0a508 (diff)
downloadpyramid-60eb090f768f48ff70b38e1846b0a6612e597f5a.tar.gz
pyramid-60eb090f768f48ff70b38e1846b0a6612e597f5a.tar.bz2
pyramid-60eb090f768f48ff70b38e1846b0a6612e597f5a.zip
Merge branch '1.4-branch'
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 63f3a2790..0034f4286 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.4b2'
+version = '1.4b3'
# The full version, including alpha/beta/rc tags.
release = version