aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
authorChris Moylan <chris@chrismoylan.com>2011-07-13 21:58:25 -0500
committerChris Moylan <chris@chrismoylan.com>2011-07-13 21:58:25 -0500
commit9247769a1457ff8ccc8b262f3bdcd7bd36694b16 (patch)
treeda5fa8800135a1e0cd837d8a722d0da1a792fd6d /mediagoblin/app.py
parent3d073d48cbf797c3da7b19670b8696d2229cce9b (diff)
parent6ae8b541f957b49ae86051814097e769d20f29af (diff)
downloadmediagoblin-9247769a1457ff8ccc8b262f3bdcd7bd36694b16.tar.lz
mediagoblin-9247769a1457ff8ccc8b262f3bdcd7bd36694b16.tar.xz
mediagoblin-9247769a1457ff8ccc8b262f3bdcd7bd36694b16.zip
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index ae39694f..147db09c 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -93,12 +93,6 @@ class MediaGoblinApp(object):
#######################################################
setup_globals(
- # TODO: No need to set these two up as globals, we could
- # just read them out of mg_globals.app_config
- email_sender_address=app_config['email_sender_address'],
- email_debug_mode=app_config['email_debug_mode'],
-
- # Actual, useful to everyone objects
app=self,
db_connection=self.connection,
database=self.db,