Tom Christie d9c7b1c585 Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working ... Conflicts: rest_framework/authentication.py rest_framework/relations.py rest_framework/serializers.py rest_framework/settings.py rest_framework/tests/authentication.py rest_framework/tests/genericrelations.py rest_framework/tests/generics.py rest_framework/tests/relations_hyperlink.py rest_framework/tests/relations_nested.py rest_framework/tests/relations_pk.py rest_framework/tests/serializer.py		2013-02-01 11:58:55 +00:00
..
migrations	Complete fix for migration	2012-11-19 11:37:37 +01:00
__init__.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
models.py	Every (base) test should now pass with python3.	2012-11-24 23:19:03 +01:00
serializers.py	Reverted #458	2012-12-07 22:25:16 +00:00
views.py	ObtainAuthToken pluggable Serializer.	2013-01-08 12:20:01 +00:00