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/auth/lib.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/auth/lib.py')
| -rw-r--r-- | mediagoblin/auth/lib.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py index 08bbdd16..6d1aec49 100644 --- a/mediagoblin/auth/lib.py +++ b/mediagoblin/auth/lib.py @@ -112,7 +112,7 @@ def send_verification_email(user, request): # TODO: There is no error handling in place send_email( - mg_globals.email_sender_address, + mg_globals.app_config['email_sender_address'], [user['email']], # TODO # Due to the distributed nature of GNU MediaGoblin, we should |