Merge branch 'master' into OPW-Moderation-Update

Conflicts: mediagoblin/db/migrations.py
2013-09-12 18:58:04 -04:00
parent a02831687a 66cafc3b74
commit 045fe0ee9d
131 changed files with 23317 additions and 7306 deletions
--- 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')