summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-07-24 16:02:16 -0400
committerChris McDonough <chrism@plope.com>2013-07-24 16:02:16 -0400
commitd79c0338e6b87ffa657f91065ce73c752f60a0b8 (patch)
tree458ac51936a8c58459a1fcb3cf9f23c697465e92 /setup.py
parentf47bccfb279ff102d1be2b4b37c201a4cde8f365 (diff)
parent716464c1706e7f68977bd5467023b6380d05e545 (diff)
downloadpyramid-d79c0338e6b87ffa657f91065ce73c752f60a0b8.tar.gz
pyramid-d79c0338e6b87ffa657f91065ce73c752f60a0b8.tar.bz2
pyramid-d79c0338e6b87ffa657f91065ce73c752f60a0b8.zip
Merge branch 'master' of github.com:Pylons/pyramid
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 4a3cecd98..df7622656 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.4',
+ version='1.5dev',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,