django-rest-auth/rest_auth/registration
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
..
__init__.py django-registration replacement 2014-10-01 14:13:21 +02:00
app_settings.py Rewrite registration logic 2015-11-24 17:11:46 +07:00
serializers.py Merge pull request #165 from jasinai/AddTranslation 2016-02-23 10:55:42 +00:00
urls.py Merge branch 'master' into developDemo 2016-02-29 12:28:06 -08:00
views.py Merge changes 2016-02-29 08:01:39 -05:00