diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-12 16:24:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-12 16:24:36 -0500 |
| commit | 5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca (patch) | |
| tree | 7ffa78df3fbac665d32238d151fe76d07f4d995e /mediagoblin/app.py | |
| parent | ac08a9acaffbafdcb99506495a192b1eaa508544 (diff) | |
| parent | 4259ad5bf1680896090290e7327b49a053a8447b (diff) | |
| download | mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.lz mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.xz mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.zip | |
Merge branch 'rodney757-media_plugins'
Conflicts:
mediagoblin.ini
mediagoblin/tests/test_mgoblin_app.ini
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() ########################################## |