Jon Gregorowicz f8a9cc152d Merge branch 'master' into jwt-support ... # Conflicts: # docs/configuration.rst # rest_auth/registration/views.py # rest_auth/tests/test_api.py # rest_auth/utils.py # rest_auth/views.py		2016-02-15 23:35:32 -05: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 #132 from asudoma/master	2016-02-08 08:12:52 +01:00
urls.py	closes PR #134 and adds same syntax to demo	2016-01-04 16:29:47 -08:00
views.py	Merge branch 'master' into jwt-support	2016-02-15 23:35:32 -05:00