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
..
api-guide	Merge remote-tracking branch 'origin/master' into 2.4.0	2014-06-23 14:02:45 +02:00
css	Fix sidebar styling when browser window is too small	2013-06-26 23:26:35 +01:00
img	New font in logo	2014-01-07 14:57:00 +00:00
js	Tweak static files with docs	2012-10-09 14:12:38 +01:00
topics	Merge remote-tracking branch 'origin/master' into 2.4.0	2014-06-23 14:02:45 +02:00
tutorial	Merge remote-tracking branch 'origin/master' into 2.4.0	2014-06-23 14:02:45 +02:00
404.html	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
index.md	Support for running the test suite with py.test	2014-03-02 12:40:30 +01:00
requirements.txt	Add basic serializer tests	2012-09-07 15:14:23 +01:00
template.html	Link to BrightAPI, and remove ad except from frontpage	2014-01-03 13:24:52 +00:00