summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-30 15:13:09 -0400
committerChris McDonough <chrism@plope.com>2013-08-30 15:13:09 -0400
commitf21a765b0872468873061cf15400c54ddfedbaaa (patch)
treed0199183059ba1826f4e55513c381a1c0ba8cf0d /setup.py
parent891100b3ec95dc83dc09f0895af399c5b1061c88 (diff)
parent00bb95f513ddcedcaf025bb528e4d7f20b1f7a4b (diff)
downloadpyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.gz
pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.bz2
pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.zip
Merge branch '1.5-branch'
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 64e63956e..6c6f1723f 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.5dev',
+ version='1.5a1',
description=('The Pyramid Web Framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,