summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-05 23:56:09 -0400
committerChris McDonough <chrism@plope.com>2014-05-05 23:56:09 -0400
commit7423971bf8aaa5fd205778820d91a6c7e3cea1bd (patch)
tree35130316c871ff0d8c41c3ad57a5f5cc1d876c7c /setup.py
parent7a6bf6f0ff1b85d0158ad49fc21037db4999c1cf (diff)
parentf9bc568657f316f20b5f576085472b80dec15cba (diff)
downloadpyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.gz
pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.bz2
pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.zip
fix merge conflicts
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 0ace211d7..54ced84e3 100644
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,7 @@ setup(name='pyramid',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[
+ "Development Status :: 6 - Mature",
"Intended Audience :: Developers",
"Programming Language :: Python",
"Programming Language :: Python :: 2.6",