heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed conflict in /auth/views.py.

Browse Source
This commit is contained in:
Aaron Williamson
2011-10-03 20:01:14 -04:00
parent 3b74ce94ff 4d7a93a493
commit 43199340a2
54 changed files with 1242 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/auth/forms.py
View File

@@ -17,7 +17,7 @@
import wtforms
import re
from mediagoblin.util import fake_ugettext_passthrough as _
from mediagoblin.tools.translate import fake_ugettext_passthrough as _
class RegistrationForm(wtforms.Form):

3
mediagoblin/auth/lib.py
View File

@@ -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

4
mediagoblin/auth/views.py
View File

@@ -21,8 +21,8 @@ from webob import exc
from mediagoblin import messages
from mediagoblin import mg_globals
from mediagoblin.util import render_to_response, redirect, render_404, setup_user_in_request
from mediagoblin.util import pass_to_ugettext as _
from mediagoblin.tools.response import render_to_response, redirect, render_404
from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.db.util import ObjectId, InvalidId
from mediagoblin.auth import lib as auth_lib
from mediagoblin.auth import forms as auth_forms