diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
| commit | 67d303ffa96a80da3a3cf48d2f9231bc1a087a19 (patch) | |
| tree | 8bd1af9ec13fed7c340a6329632bddf2d17e3fb6 /mediagoblin/app.py | |
| parent | 7b77f7e490a27de57a4dab5301662ef95d11b213 (diff) | |
| parent | 64ad0beea83b1f4b50462bcb67c54156fc9365a5 (diff) | |
| download | mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.lz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.xz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.zip | |
merge with remote master branch of cweb.
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index ada0c8ba..57e09e49 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -29,6 +29,7 @@ from mediagoblin.tools import common, session, translate, template from mediagoblin.tools.response import render_http_exception from mediagoblin.tools.theme import register_themes from mediagoblin.tools import request as mg_request +from mediagoblin.media_types.tools import media_type_warning from mediagoblin.mg_globals import setup_globals from mediagoblin.init.celery import setup_celery_from_config from mediagoblin.init.plugins import setup_plugins @@ -69,6 +70,8 @@ class MediaGoblinApp(object): # Open and setup the config global_config, app_config = setup_global_and_app_config(config_path) + media_type_warning() + setup_crypto() ########################################## |