Merge changes

This commit is contained in:
Jon Gregorowicz 2016-02-29 08:01:39 -05:00
parent 1eb4b45e50
commit 4ba9841bc5
2 changed files with 2 additions and 2 deletions

View File

@ -4,6 +4,7 @@ Changelog
0.8.0 0.8.0
----- -----
- added support for django-rest-framework-jwt - added support for django-rest-framework-jwt
0.7.0 0.7.0
----- -----
- Wrapped API returned strings in ugettext_lazy - Wrapped API returned strings in ugettext_lazy
@ -67,4 +68,3 @@ Changelog
- changed password reset confim url - uid and token should be sent in POST - changed password reset confim url - uid and token should be sent in POST
- increase test coverage - increase test coverage
- made compatibile with django 1.7 - made compatibile with django 1.7
- removed user profile support

View File

@ -103,4 +103,4 @@ class SocialLoginView(LoginView):
------------- -------------
""" """
serializer_class = SocialLoginSerializer serializer_class = SocialLoginSerializer