diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-28 10:46:46 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-28 10:46:46 -0700 |
| commit | 8087f56b07b11a8abc1f6d5108a70765712cc63d (patch) | |
| tree | 7002a38f819f8ccfc505494c9eb6d6d0ed388f33 /mediagoblin/auth/forms.py | |
| parent | 377db0e7ffdca6ce56041d28eba536ecd3b2a58a (diff) | |
| parent | f9e032212dff4d54de644cb5537bc0bef6d24c7f (diff) | |
| download | mediagoblin-8087f56b07b11a8abc1f6d5108a70765712cc63d.tar.lz mediagoblin-8087f56b07b11a8abc1f6d5108a70765712cc63d.tar.xz mediagoblin-8087f56b07b11a8abc1f6d5108a70765712cc63d.zip | |
Merge remote-tracking branch 'upstream/master' into change_email
Conflicts:
mediagoblin/auth/lib.py
Diffstat (limited to 'mediagoblin/auth/forms.py')
| -rw-r--r-- | mediagoblin/auth/forms.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py index 599b2576..0a391d67 100644 --- a/mediagoblin/auth/forms.py +++ b/mediagoblin/auth/forms.py @@ -16,7 +16,6 @@ import wtforms -from mediagoblin.tools.mail import normalize_email from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from mediagoblin.auth.tools import normalize_user_or_email_field |