diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-17 15:51:30 -0600 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-17 15:51:30 -0600 |
commit | 00cf28da215e73c494f553e7de3d21a9b63cf0cf (patch) | |
tree | 461ee702dca35ea6ffe56380286c24abe3bd155f /mediagoblin/init | |
parent | c813f0bd5776dde0e3c42c12b17f83f211b50e6a (diff) | |
parent | ba5ea989a5826440e8b84af8128dadd0ae252259 (diff) | |
download | mediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.tar.lz mediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.tar.xz mediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.zip |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/init')
-rw-r--r-- | mediagoblin/init/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index ab6e6399..7c832442 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -26,7 +26,7 @@ from mediagoblin import mg_globals from mediagoblin.mg_globals import setup_globals from mediagoblin.db.open import setup_connection_and_db_from_config, \ check_db_migrations_current, load_models -from mediagoblin.workbench import WorkbenchManager +from mediagoblin.tools.workbench import WorkbenchManager from mediagoblin.storage import storage_system_from_config |