Commit Graph

5 Commits

Author SHA1 Message Date
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
Billy Ferguson
8d91e1881e Added logout functionality to demo project 2016-02-08 17:14:25 -05:00
Tabatha Memmott
1a08fd90dc email work 2016-01-07 13:39:16 -08:00
Mateusz Sikora
81a96cfe19 final versio of demo project 2014-10-16 13:13:55 +02:00
Mateusz Sikora
5fd7ea5596 update demo project - still not finished 2014-10-15 17:32:19 +02:00