diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-19 16:04:23 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-19 16:04:23 -0500 |
| commit | 74ae6fb0b620c2f899e2c97ba5f6af105103df6f (patch) | |
| tree | 1fc5a7634299ba221858536a12d3fa8066a1898f /mediagoblin/auth/views.py | |
| parent | 3dc6184167691d390f016c2b73fd6a9887955102 (diff) | |
| parent | f9931418d65c7823e13bc45f647a682ddf3b8632 (diff) | |
| download | mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.tar.lz mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.tar.xz mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'
Conflicts:
mediagoblin/auth/views.py
mediagoblin/edit/forms.py
mediagoblin/templates/mediagoblin/edit/edit_account.html
Diffstat (limited to 'mediagoblin/auth/views.py')
| -rw-r--r-- | mediagoblin/auth/views.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index d114833c..8563195f 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -24,11 +24,8 @@ from mediagoblin.tools.response import render_to_response, redirect, render_404 from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.mail import email_debug_message from mediagoblin.tools.pluginapi import hook_handle -from mediagoblin.auth import forms as auth_forms from mediagoblin.auth.tools import (send_verification_email, register_user, - send_fp_verification_email, check_login_simple) -from mediagoblin import auth @allow_registration |