Merge branch 'video_gstreamer-only'

Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py
This commit is contained in:
Joar Wandborg
2011-11-21 21:51:30 +01:00
25 changed files with 2993 additions and 32 deletions

View File

@@ -20,6 +20,8 @@ import sys
MANDATORY_CELERY_IMPORTS = ['mediagoblin.process_media']
print(MANDATORY_CELERY_IMPORTS)
DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module'