tox.ini
813 Bytes
-
Merge branch 'version-3.1' into oauth_as_package · 0cc99079
Conflicts: requirements-test.txt rest_framework/compat.py tests/settings.py tox.ini
José Padilla committed
Conflicts: requirements-test.txt rest_framework/compat.py tests/settings.py tox.ini