Xavier Ordoquy 2489e38a06 Merge remote-tracking branch 'origin/master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini		2014-06-23 14:02:45 +02:00
..
1-serialization.md	Added missing "the" word	2014-05-05 14:44:54 +02: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	Removed superfluous "./"s	2014-05-05 20:28:00 +02: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 remote-tracking branch 'origin/master' into 2.4.0	2014-06-23 14:02:45 +02:00
quickstart.md	Expanded notes in quickstart. Closes #1127. Closes #1128.	2013-12-13 15:30:59 +00:00