Tom Christie a8e090df04 Remove accidental conflict diff		2013-05-07 17:14:25 +01:00
..
1-serialization.md	Extra note on method	2013-03-17 19:59:13 +00:00
2-requests-and-responses.md	Example and spelling fixes. Change "browseable" to "browsable" for consistency.	2013-05-01 21:26:40 -07:00
3-class-based-views.md	Various clean up and lots of docs	2013-04-24 22:40:24 +01:00
4-authentication-and-permissions.md	Merge master	2013-05-05 18:12:35 +01:00
5-relationships-and-hyperlinked-apis.md	Merge master	2013-05-05 18:12:35 +01:00
6-viewsets-and-routers.md	Simplifying bits of docs	2013-05-02 12:08:05 +01:00
quickstart.md	Remove accidental conflict diff	2013-05-07 17:14:25 +01:00