diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-21 18:58:31 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-21 18:58:31 -0400 |
| commit | 036a633c5414887cc7c080c9d2ab813f539bd14a (patch) | |
| tree | 19d19b946405e6add8cd7886190948978e42f5a4 /docs/conf.py | |
| parent | 731d5f571c2b78a885e176abfd0c16f78ec6bc02 (diff) | |
| parent | eb33944d0d861bbb3aebdf069cce64f8c1c3faef (diff) | |
| download | pyramid-036a633c5414887cc7c080c9d2ab813f539bd14a.tar.gz pyramid-036a633c5414887cc7c080c9d2ab813f539bd14a.tar.bz2 pyramid-036a633c5414887cc7c080c9d2ab813f539bd14a.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index d694b2151..5254561ba 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.3b3' +version = '1.3' # The full version, including alpha/beta/rc tags. release = version |