diff options
| author | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
|---|---|---|
| committer | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
| commit | 1d0148aef1493467dacb6c39c4e080ee4a5246d2 (patch) | |
| tree | 5213418660d4e079eb8dac6bc8ea2e4fdc140088 /setup.py | |
| parent | 200433dc38a2139462e0331be36ee49a80a81a12 (diff) | |
| parent | 5c99cd01a70f2d597ac7669e8d944ddf79b05281 (diff) | |
| download | mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.lz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.xz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Conflicts:
docs/source/siteadmin/media-types.rst
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -44,12 +44,11 @@ setup( 'setuptools', 'PasteScript', 'beaker', - 'routes', 'webob<=1.2a2,>=1.1', 'wtforms', 'py-bcrypt', 'nose', - 'werkzeug', + 'werkzeug>=0.7', 'celery==2.5.3', 'kombu==2.1.7', 'jinja2', @@ -95,7 +94,7 @@ setup( classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment", - "License :: OSI Approved :: GNU Affero General Public License", + "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", "Operating System :: OS Independent", "Programming Language :: Python", 'Programming Language :: Python :: 2.6', |