Tom Christie 9c41c007af Merge branch 'master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py		2013-12-13 16:32:34 +00:00
..
api-guide	Merge branch 'master' into 2.4.0	2013-12-13 16:32:34 +00:00
css	Fix sidebar styling when browser window is too small	2013-06-26 23:26:35 +01:00
img	First pass on contribution guide	2013-12-04 14:59:09 +00:00
js	Tweak static files with docs	2012-10-09 14:12:38 +01:00
topics	Merge branch 'master' into 2.4.0	2013-12-13 16:32:34 +00:00
tutorial	Merge branch 'master' into 2.4.0	2013-12-13 16:32:34 +00:00
404.html	Add a 404 page to the docs	2013-11-18 16:10:26 +00:00
index.md	Expanded notes in quickstart. Closes #1127. Closes #1128.	2013-12-13 15:30:59 +00:00
requirements.txt	Add basic serializer tests	2012-09-07 15:14:23 +01:00
template.html	Minor grammar fix -- 'team' is singular	2013-12-08 19:34:24 -05:00