Tom Christie 52686420f4 Merge branch 'bennbollay-patch-1' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini		2013-12-23 09:48:59 +00:00
..
1-serialization.md	Simplified some examples in tutorial	2013-12-23 09:06:03 +01: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	Back out permissions example change in favor of easier to follow example	2013-12-23 09:12:34 +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