diff options
| author | xray7224 <xray7224@googlemail.com> | 2013-07-14 15:27:52 +0100 |
|---|---|---|
| committer | xray7224 <xray7224@googlemail.com> | 2013-07-14 15:27:52 +0100 |
| commit | e49263564b0ee8859c43e2716fcedab6e80bf164 (patch) | |
| tree | 37411b19738484cbba814e584b8d3547d3a2ded0 /mediagoblin/app.py | |
| parent | 49a47ec991152a5dd25a7460e1d3d11afb73d32d (diff) | |
| parent | 2d0028e93283fea397133294a5eb45b67d5ed0ab (diff) | |
| download | mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.lz mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.xz mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
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() ########################################## |