Tom Christie 9c41c007af Merge branch 'master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py		2013-12-13 16:32:34 +00:00
..
1-serialization.md	**very minor** typo fix	2013-10-05 19:29:25 -04:00
2-requests-and-responses.md	Update 2-requests-and-responses.md	2013-10-18 09:10:54 +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	Add User import. Refs #599	2013-11-18 09:29:09 +00: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