test_urlizer.py
1.46 KB
-
Merge remote-tracking branch 'pelme/pytest' into feature/pytest · 1797a74e
Conflicts: .travis.yml rest_framework/runtests/runtests.py tests/test_filters.py tests/test_pagination.py tox.ini
Xavier Ordoquy committed
Conflicts: .travis.yml rest_framework/runtests/runtests.py tests/test_filters.py tests/test_pagination.py tox.ini