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	Reorganized test files	2015-12-04 09:32:03 +01:00
django_urls.py	Reorganized test files	2015-12-04 09:32:03 +01:00
requirements.pip	* Added support for REST_USE_JWT	2016-01-04 12:45:33 -05:00
settings.py	* Added support for REST_USE_JWT	2016-01-04 12:45:33 -05:00
test_api.py	Merge pull request #145 from mdentremont/topic/131	2016-01-14 23:53:31 +01:00
test_base.py	* Added support for REST_USE_JWT	2016-01-04 12:45:33 -05:00
test_social.py	Merge branch 'master' into jwt-support	2016-02-15 23:35:32 -05:00
urls.py	url change for tests	2016-01-05 11:46:01 -08:00