summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-02-06 01:12:24 -0600
committerMichael Merickel <michael@merickel.org>2015-02-06 01:12:24 -0600
commitb63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (patch)
tree695d4b5e5ae974d0770acfbe9b8231ea1c71288a /setup.py
parentd35a916095943b020f30acb90e878abe9bfd4fb1 (diff)
parent4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5 (diff)
downloadpyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.gz
pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.bz2
pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.zip
Merge branch 'master' into feature.re-entrant-config
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 629b77f3d..3233193e7 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.6dev',
+ version='1.6.dev0',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[