diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-13 23:14:42 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-13 23:14:42 -0500 |
| commit | c47c37ed953689e70441c4c143e4c06f1645be7d (patch) | |
| tree | f63fed482a8e9c8dcd54cf0bd18d747f8516179b /mediagoblin/mg_globals.py | |
| parent | 59051a23f01eb49ed6fe6975991730021ac169ac (diff) | |
| parent | 6ae8b541f957b49ae86051814097e769d20f29af (diff) | |
| download | mediagoblin-c47c37ed953689e70441c4c143e4c06f1645be7d.tar.lz mediagoblin-c47c37ed953689e70441c4c143e4c06f1645be7d.tar.xz mediagoblin-c47c37ed953689e70441c4c143e4c06f1645be7d.zip | |
Merge branch 'master' into f411_new_migrations
Conflicts:
mediagoblin/db/open.py
Diffstat (limited to 'mediagoblin/mg_globals.py')
| -rw-r--r-- | mediagoblin/mg_globals.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py index 739f44ee..12a0e016 100644 --- a/mediagoblin/mg_globals.py +++ b/mediagoblin/mg_globals.py @@ -20,12 +20,6 @@ database = None public_store = None queue_store = None -# Dump mail to stdout instead of sending it: -email_debug_mode = False - -# Address for sending out mails -email_sender_address = None - # A WorkBenchManager workbench_manager = None |