Merge branch 'video_gstreamer-only'
Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py
This commit is contained in:
@@ -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'
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user