aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2014-01-02 15:01:54 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-01-02 15:01:54 -0600
commite0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16 (patch)
tree24206ac14e260404243057351fc6c156e5870bb6 /mediagoblin/gmg_commands
parent408aa9cf3b29d778eb7594e4de1720a6bb158024 (diff)
parent635dd6cc31d4d9afbe648f76af2f799eebf8f1f1 (diff)
downloadmediagoblin-e0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16.tar.lz
mediagoblin-e0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16.tar.xz
mediagoblin-e0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16.zip
Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'
Conflicts: mediagoblin/db/util.py mediagoblin/gmg_commands/dbupdate.py
Diffstat (limited to 'mediagoblin/gmg_commands')
-rw-r--r--mediagoblin/gmg_commands/dbupdate.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index 05762946..27283a20 100644
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -28,6 +28,7 @@ logging.basicConfig()
## Let's not set the level as debug by default to avoid confusing users :)
# _log.setLevel(logging.DEBUG)
+
def dbupdate_parse_setup(subparser):
pass