diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-10-01 21:27:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-10-01 21:27:36 -0500 |
| commit | b43b17fc2686f5524413a66f8e98f3ab0cc11a60 (patch) | |
| tree | 36fb9cf3155a2ff715b1e93f29be6a17cb2113e9 /mediagoblin/auth/lib.py | |
| parent | e27396802caaab9a939c56d19c991339157c493f (diff) | |
| parent | 91e42c467d898ef70dec2d2d34e4173ea771d2ed (diff) | |
| download | mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.lz mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.xz mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.zip | |
Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'
Conflicts:
mediagoblin/util.py
Diffstat (limited to 'mediagoblin/auth/lib.py')
| -rw-r--r-- | mediagoblin/auth/lib.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py index d7d351a5..4c57ef88 100644 --- a/mediagoblin/auth/lib.py +++ b/mediagoblin/auth/lib.py @@ -19,7 +19,8 @@ import random import bcrypt -from mediagoblin.util import send_email, render_template +from mediagoblin.tools.mail import send_email +from mediagoblin.tools.template import render_template from mediagoblin import mg_globals |