summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-04-08 19:15:23 -0400
committerChris McDonough <chrism@plope.com>2014-04-08 19:15:23 -0400
commit3d8c4346cacb14f10f72ba8559fa9e23105f56ed (patch)
tree61fe5601b19a5c72aaf331034a898cfdd65cb729 /setup.py
parent2ecc60e1f55e42a99d8d5339e0724babb4c82a2e (diff)
parent0cb759758c97feba48c0bbba149a774f85f2606a (diff)
downloadpyramid-3d8c4346cacb14f10f72ba8559fa9e23105f56ed.tar.gz
pyramid-3d8c4346cacb14f10f72ba8559fa9e23105f56ed.tar.bz2
pyramid-3d8c4346cacb14f10f72ba8559fa9e23105f56ed.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 bb443330d..2214611b7 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.5b1',
+ version='1.5',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[