Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata

Conflicts: mediagoblin/gmg_commands/batchaddmedia.py setup.py
2014-04-21 12:17:39 -04:00 · 2014-04-21 12:17:39 -04:00 · 77a19712c3
commit 77a19712c3
parent 45f426ddee 89b6b55766
1 changed files with 1 additions and 0 deletions
--- a/setup.py
+++ b/setup.py
@ -70,6 +70,7 @@ try:
        'oauthlib==0.5.0',
        'unidecode',
        'jsonschema',
+        'requests',
        'ExifRead',

        # PLEASE change this when we can; a dependency is forcing us to set this