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	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
runcoverage.py	Drop six module from coverage.	2013-02-12 08:58:29 +00:00
runtests.py	Don’t forget to setup django for 1.7+ as it’s not a regular django command.	2014-01-28 13:20:51 +01:00
settings.py	Merge remote-tracking branch 'origin/master' into 2.4.0	2014-04-13 00:05:57 +02:00
urls.py	Drop 1.3 support	2013-09-25 10:30:04 +01:00