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
..
2.2-announcement.md	Remove a couple of .html suffixes in docs	2013-11-19 11:01:27 +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	Merge branch 'bennbollay-patch-1' into 2.4.0	2013-12-23 09:48:59 +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	Typo	2013-12-16 11:59:14 +00:00
credits.md	Added @philipforget for work on #1232. Thanks :)	2013-12-13 22:01:19 +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 branch 'bennbollay-patch-1' into 2.4.0	2013-12-23 09:48:59 +00: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