Xavier Ordoquy bff3bebdbe Merge remote-tracking branch 'reference/stable/3.3.x' into merge_test ... # Conflicts: # docs/topics/release-notes.md		2016-04-08 15:46:17 +02:00
..
api-guide	Merge remote-tracking branch 'reference/stable/3.3.x' into merge_test	2016-04-08 15:46:17 +02:00
img	Mention DRF Docs - Live API Endpoints	2016-01-23 23:08:19 +00:00
topics	Merge remote-tracking branch 'reference/stable/3.3.x' into merge_test	2016-04-08 15:46:17 +02:00
tutorial	updated tutorial for django 1.9	2016-03-07 20:59:58 +01:00
CNAME	Include CNAME file	2014-11-25 16:01:32 +00:00
index.md	Merge pull request #3821 from zwernberg/master	2016-01-11 16:25:11 +00:00