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
..
1-serialization.md	Use a local virtualenv, not in the users homedir.	2014-01-14 17:13:48 +00:00
2-requests-and-responses.md	Simplified some examples in tutorial	2013-12-23 09:06:03 +01:00
3-class-based-views.md	Update 3-class-based-views.md	2013-10-18 09:32:04 +01:00
4-authentication-and-permissions.md	clarified which urls.py to edit	2014-02-28 08:40:45 -08:00
5-relationships-and-hyperlinked-apis.md	Fix Tutorial5 serializers.py typo	2013-07-27 10:09:56 +10:00
6-viewsets-and-routers.md	Merge master	2013-09-25 09:44:26 +01:00
quickstart.md	Expanded notes in quickstart. Closes #1127. Closes #1128.	2013-12-13 15:30:59 +00:00