Xavier Ordoquy d08536ad9d Merge remote-tracking branch 'origin/master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini		2014-04-13 00:05:57 +02:00
..
__init__.py	XML cleanup	2013-02-22 19:46:47 +00:00
breadcrumbs.py	Fix breadcrumb view names	2013-08-29 20:51:51 +01:00
encoders.py	Merge remote-tracking branch 'origin/master' into 2.4.0	2014-04-13 00:05:57 +02:00
formatting.py	Move view name/description functions into public space	2013-08-19 08:24:27 +01:00
mediatypes.py	Fix dict_keys equality test for python 3.	2014-04-11 05:49:49 +01:00