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
..
2.2-announcement.md	Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains	2014-01-08 15:22:41 +00:00
2.3-announcement.md	Fixed typos in a bunch of docs	2013-08-07 14:00:06 -04:00
2.4-accouncement.md	Minor tweaks to 'lookup_value_regex' work	2014-01-13 15:37:52 +00:00
ajax-csrf-cors.md	Minor documentation fix.	2013-09-29 12:49:38 +02:00
browsable-api.md	Refs #1109 -- Update docs. Integrate changes from feedback.	2013-09-14 00:54:44 +10:00
browser-enhancements.md	Fix md formatting and typos	2013-05-28 17:13:12 +02:00
contributing.md	Merge remote-tracking branch 'pelme/pytest' into feature/pytest	2014-04-17 09:53:44 +02:00
credits.md	Update credits	2014-02-13 17:40:00 +00:00
documenting-your-api.md	Fixed typos in a bunch of docs	2013-08-07 14:00:06 -04:00
release-notes.md	Merge remote-tracking branch 'origin/master' into 2.4.0	2014-06-23 14:02:45 +02:00
rest-framework-2-announcement.md	Fix md formatting and typos	2013-05-28 17:13:12 +02:00
rest-hypermedia-hateoas.md	Added 'Documenting your API' section. Closes #616	2013-07-02 22:15:46 +01:00
writable-nested-serializers.md	Note on '.model' as default only, with 'serializer_class', and 'queryset' attributes prefered. Closes #1100	2013-09-12 21:41:21 +01:00