Files · 2489e38a06f575aa144644eee683bd87f20186ef · edx / django-rest-framework

Merge remote-tracking branch 'origin/master' into 2.4.0 · 2489e38a

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

committed Jun 23, 2014

2489e38a

Name	Last commit	Last update
docs		Loading commit data...
rest_framework		Loading commit data...
tests		Loading commit data...
.gitignore		Loading commit data...
.travis.yml		Loading commit data...
CONTRIBUTING.md		Loading commit data...
MANIFEST.in		Loading commit data...
README.md		Loading commit data...
conftest.py		Loading commit data...
mkdocs.py		Loading commit data...
optionals.txt		Loading commit data...
pytest.ini		Loading commit data...
requirements.txt		Loading commit data...
setup.cfg		Loading commit data...
setup.py		Loading commit data...
tox.ini		Loading commit data...

README.md