summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-14 20:39:21 -0500
committerChris McDonough <chrism@plope.com>2011-12-14 20:39:21 -0500
commit3ee1022068481dea058064cf28c4bc114ca6bd51 (patch)
tree3353066003111f51d4dd6d36de82af968fd27b5a /docs/conf.py
parent9dce50a3bdd30b7c5c9b8efd184bad7cbbb1a030 (diff)
parentc45c29fe5ce316d42965e5a84a1fb195a5320456 (diff)
downloadpyramid-3ee1022068481dea058064cf28c4bc114ca6bd51.tar.gz
pyramid-3ee1022068481dea058064cf28c4bc114ca6bd51.tar.bz2
pyramid-3ee1022068481dea058064cf28c4bc114ca6bd51.zip
merge goodwill's changes from master
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 79543777d..5281017e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,6 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
#
# The short X.Y version.
version = '1.3a2'
+
# The full version, including alpha/beta/rc tags.
release = version