rest_framework · 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
..
authtoken		Loading commit data...
static/rest_framework		Loading commit data...
templates/rest_framework		Loading commit data...
templatetags		Loading commit data...
utils		Loading commit data...
__init__.py		Loading commit data...
authentication.py		Loading commit data...
compat.py		Loading commit data...
decorators.py		Loading commit data...
exceptions.py		Loading commit data...
fields.py		Loading commit data...
filters.py		Loading commit data...
generics.py		Loading commit data...
mixins.py		Loading commit data...
models.py		Loading commit data...
negotiation.py		Loading commit data...
pagination.py		Loading commit data...
parsers.py		Loading commit data...
permissions.py		Loading commit data...
relations.py		Loading commit data...
renderers.py		Loading commit data...
request.py		Loading commit data...
response.py		Loading commit data...
reverse.py		Loading commit data...
routers.py		Loading commit data...
serializers.py		Loading commit data...
settings.py		Loading commit data...
status.py		Loading commit data...
test.py		Loading commit data...
throttling.py		Loading commit data...
urlpatterns.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...
viewsets.py		Loading commit data...