diff options
| author | Blaise Laflamme <blaise@laflamme.org> | 2011-11-26 18:31:22 -0500 |
|---|---|---|
| committer | Blaise Laflamme <blaise@laflamme.org> | 2011-11-26 18:31:22 -0500 |
| commit | 7613a6441f273ccc5642e20b2ce5788d01291466 (patch) | |
| tree | 8de6ce23bf54325b8524c50336020cb509ce1b16 /docs/conf.py | |
| parent | 11129ca073b4926037368d9a0bf079dc422e28f7 (diff) | |
| parent | 50e89abccc9c23949fb7cdd928a865712c34aa75 (diff) | |
| download | pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.tar.gz pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.tar.bz2 pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.zip | |
Merge branch 'master' of github.com:Pylons/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 f97ad1547..4010cf111 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -94,7 +94,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.2' +version = '1.3dev' # The full version, including alpha/beta/rc tags. release = version |