diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-06-15 22:18:24 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-06-15 22:18:24 +0200 |
| commit | 9e883ed3b223311e3325e41e75dec7ee82875ac2 (patch) | |
| tree | de5c404187681bf35d7a92e917c54a69e902df91 /mediagoblin/app.py | |
| parent | a48014d67a5185c645ac876d365b4cb85cbb6b1f (diff) | |
| parent | 0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff) | |
| download | mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.lz mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.xz mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.zip | |
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 5d594039..a1c6b512 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -23,7 +23,7 @@ from webob import Request, exc from mediagoblin import routing, util, storage, staticdirect from mediagoblin.db.open import setup_connection_and_db_from_config -from mediagoblin.globals import setup_globals +from mediagoblin.mg_globals import setup_globals from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR |