diff options
| author | Dylan Jay <software@pretaweb.com> | 2011-08-25 13:13:31 +1000 |
|---|---|---|
| committer | Dylan Jay <software@pretaweb.com> | 2011-08-25 13:13:31 +1000 |
| commit | c36e1570e997a90ac0666426b7c459adb5cd54bc (patch) | |
| tree | d8043974a89eaf5d772e5cef999b2275836553b0 /docs/conf.py | |
| parent | a98c0169fad222654e0c2ba0573653002a21d29b (diff) | |
| parent | a6035f3ccdd770fd463a67e216fa5c6aab9ced5c (diff) | |
| download | pyramid-c36e1570e997a90ac0666426b7c459adb5cd54bc.tar.gz pyramid-c36e1570e997a90ac0666426b7c459adb5cd54bc.tar.bz2 pyramid-c36e1570e997a90ac0666426b7c459adb5cd54bc.zip | |
Merge branch 'master' of github.com:djay/pyramid
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 f021f01a2..23b88b949 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.2dev' +version = '1.2a1' # The full version, including alpha/beta/rc tags. release = version |