diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
| commit | 045fe0ee9d43aa825de6fbf14fe8fd48953d4eff (patch) | |
| tree | e0743c13e20845a613ba8e4064cb1e0f10f54025 /setup.py | |
| parent | a02831687a6026b2baa0f971ecb3e594c3f415e2 (diff) | |
| parent | 66cafc3b74d476710013efb46341b989028f3057 (diff) | |
| download | mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.lz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.xz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.zip | |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -48,7 +48,7 @@ setup( 'pytest>=2.3.1', 'pytest-xdist', 'werkzeug>=0.7', - 'celery', + 'celery>=3.0', 'kombu', 'jinja2', 'sphinx', @@ -63,7 +63,7 @@ setup( 'itsdangerous', 'pytz', 'six', - 'oauthlib', + 'oauthlib==0.5.0', ## This is optional! # 'translitcodec', ## For now we're expecting that users will install this from |