Merge branch 'master' of github.com:Tivix/django-rest-auth

This commit is contained in:
Mateusz Sikora 2014-10-24 15:52:17 +02:00
commit 644c4d28e1
2 changed files with 2 additions and 2 deletions

View File

@ -1,3 +1,3 @@
django==1.7
django==1.7.1
django-rest-auth==0.3.0
django-allauth==0.18.0

View File

@ -11,7 +11,7 @@ from rest_framework.authentication import SessionAuthentication, \
from rest_framework.authtoken.models import Token
from rest_framework.generics import RetrieveUpdateAPIView
from app_settings import (TokenSerializer, UserDetailsSerializer,
from .app_settings import (TokenSerializer, UserDetailsSerializer,
LoginSerializer, PasswordResetSerializer, PasswordResetConfirmSerializer,
PasswordChangeSerializer)