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

Conflicts:
	mediagoblin/gmg_commands/batchaddmedia.py
	setup.py
This commit is contained in:
tilly-Q 2014-04-21 12:17:39 -04:00
commit 77a19712c3

View File

@ -70,6 +70,7 @@ try:
'oauthlib==0.5.0', 'oauthlib==0.5.0',
'unidecode', 'unidecode',
'jsonschema', 'jsonschema',
'requests',
'ExifRead', 'ExifRead',
# PLEASE change this when we can; a dependency is forcing us to set this # PLEASE change this when we can; a dependency is forcing us to set this