Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2025-02-11 15:30:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
developDemo
django-rest-auth/rest_auth
History
Tabatha Memmott e01fdc643a Merge branch 'master' into developDemo 
Conflicts:
	rest_auth/app_settings.py
	rest_auth/serializers.py
	rest_auth/views.py
 resolved conflicts
2016-02-29 12:28:06 -08:00
..
locale/de/LC_MESSAGES Adds ugettext_lazy to more texts 2016-02-02 15:29:16 +01:00
registration Merge branch 'master' into developDemo 2016-02-29 12:28:06 -08:00
tests Merge branch 'master' into jwt-support 2016-02-29 07:45:43 -05:00
__init__.py First commit. 2014-04-30 12:52:05 -07:00
admin.py First commit. 2014-04-30 12:52:05 -07:00
app_settings.py Merge branch 'master' into developDemo 2016-02-29 12:28:06 -08:00
models.py Add support for custom Token model 2016-01-02 15:59:06 -02:00
serializers.py Merge branch 'master' into developDemo 2016-02-29 12:28:06 -08:00
social_serializers.py fixed pep8 error in social_serializers 2016-02-23 17:52:44 +05:30
urls.py email work 2016-01-07 13:39:16 -08:00
utils.py Fixing merge tool induced file endings 2016-02-16 00:49:41 -05:00
views.py Merge branch 'master' into developDemo 2016-02-29 12:28:06 -08:00