diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
| commit | 045fe0ee9d43aa825de6fbf14fe8fd48953d4eff (patch) | |
| tree | e0743c13e20845a613ba8e4064cb1e0f10f54025 /mediagoblin/auth | |
| parent | a02831687a6026b2baa0f971ecb3e594c3f415e2 (diff) | |
| parent | 66cafc3b74d476710013efb46341b989028f3057 (diff) | |
| download | mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.lz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.xz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.zip | |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/auth')
| -rw-r--r-- | mediagoblin/auth/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 5e2a2af0..6f343d0e 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -341,7 +341,7 @@ def verify_forgot_password(request): messages.add_message( request, messages.ERROR, _('You are no longer an active user. Please contact the system' - ' admin to reactivate your accoutn.')) + ' admin to reactivate your account.')) return redirect( request, 'index') |