aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2014-04-21 12:17:39 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2014-04-21 12:17:39 -0400
commit77a19712c390e5f7b2beb09314f8b4f2c2eaa794 (patch)
treef7ba1818c021811984cb5aafcfd9141aa77e8d3a /setup.py
parent45f426ddee9900439c086a8bb3d1cfaedf3eca6f (diff)
parent89b6b55766f71466ec001398b2537569543dc175 (diff)
downloadmediagoblin-77a19712c390e5f7b2beb09314f8b4f2c2eaa794.tar.lz
mediagoblin-77a19712c390e5f7b2beb09314f8b4f2c2eaa794.tar.xz
mediagoblin-77a19712c390e5f7b2beb09314f8b4f2c2eaa794.zip
Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata
Conflicts: mediagoblin/gmg_commands/batchaddmedia.py setup.py
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 15fd913c..0716e45f 100644
--- 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