Jon Gregorowicz e3901516cb Merge branch 'master' into jwt-support ... # Conflicts: # docs/changelog.rst # rest_auth/registration/views.py		2016-02-29 07:45:43 -05:00
..
api_endpoints.rst	Merge pull request #152 from caruccio/logout-on-get	2016-02-26 13:38:01 +01:00
changelog.rst	Merge branch 'master' into jwt-support	2016-02-29 07:45:43 -05:00
conf.py	draft version of documentation	2014-10-09 13:01:47 +02:00
configuration.rst	Merge branch 'master' into jwt-support	2016-02-29 07:45:43 -05:00
demo.rst	Update demo.rst	2015-12-21 11:01:41 -05:00
faq.rst	Added FAQ issue.	2016-01-14 22:36:58 +01:00
index.rst	Update index.rst	2016-02-23 10:20:52 +00:00
installation.rst	Merge branch 'master' into jwt-support	2016-02-29 07:45:43 -05:00
introduction.rst	add FAQ section in docs	2014-11-12 11:18:21 +01:00
make.bat	draft version of documentation	2014-10-09 13:01:47 +02:00
Makefile	draft version of documentation	2014-10-09 13:01:47 +02:00