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
..
__init__.py	Move the various compat things to the compat module.	2013-01-03 11:41:07 +01:00
breadcrumbs.py	Fix repeated breadcrumbs when optional trailing slash is used	2012-11-07 10:03:51 +00:00
encoders.py	Add timedelta encoder to the JSONEncoder class.	2013-01-15 13:08:52 +00:00
mediatypes.py	Default encoding should probably be latin-1 as some RFC seems to imply it.	2012-11-23 01:11:09 +01:00