summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-10-27 19:45:51 -0400
committerChris McDonough <chrism@plope.com>2012-10-27 19:45:51 -0400
commit220435320613530bde80dd1c4a38a3e719f4af5d (patch)
tree7d1b5b1b367b6fc4b5d16cb88e3f8976acf6ece5 /setup.py
parent0a1fb171514f4a41cf8679ef61c06397854dde07 (diff)
parent4a6cca62ddf33580b1de210ef5ca54bfb2769243 (diff)
downloadpyramid-220435320613530bde80dd1c4a38a3e719f4af5d.tar.gz
pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.tar.bz2
pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.zip
Merge branch 'master' into 1.4-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 40117cf4c..4ea63a3ee 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.4a2',
+ version='1.4a3',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,