Merge branch 'master' into 2.4.0
Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py
Showing
docs/404.html
0 → 100644
This diff is collapsed.
Click to expand it.
docs/img/travis-status.png
0 → 100644
9.79 KB
This diff is collapsed.
Click to expand it.
rest_framework/tests/test_status.py
0 → 100644
setup.cfg
0 → 100644