release-notes.md
25.8 KB
-
Merge branch 'bennbollay-patch-1' into 2.4.0 · 52686420
Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini
Tom Christie committed
Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini