test_htmlrenderer.py
4.03 KB
-
Merge remote-tracking branch 'reference/2.4.0' into feature/pytest · 7b4463f7
Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini
Xavier Ordoquy committed
Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini