urlpatterns.py
2.36 KB
-
Merge branch 'master' into 2.4.0 · 9c41c007
Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py
Tom Christie committed
Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py