diff options
| author | Chris McDonough <chrism@plope.com> | 2012-10-27 19:45:51 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-10-27 19:45:51 -0400 |
| commit | 220435320613530bde80dd1c4a38a3e719f4af5d (patch) | |
| tree | 7d1b5b1b367b6fc4b5d16cb88e3f8976acf6ece5 /docs/conf.py | |
| parent | 0a1fb171514f4a41cf8679ef61c06397854dde07 (diff) | |
| parent | 4a6cca62ddf33580b1de210ef5ca54bfb2769243 (diff) | |
| download | pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.tar.gz pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.tar.bz2 pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.zip | |
Merge branch 'master' into 1.4-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 337b1d8bf..9bda4c798 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.4a2' +version = '1.4a3' # The full version, including alpha/beta/rc tags. release = version |