Merge branch 'django-3-compat' of https://github.com/encode/django-rest-framework into django-3-compat

This commit is contained in:
Tom Christie 2019-11-21 11:33:10 +00:00
commit c93ac98a1f

View File

@ -67,7 +67,7 @@ def pytest_configure(config):
) )
# guardian is optional # guardian is optional
# Note that for the test cases we're installing a version of django-gaurdian # Note that for the test cases we're installing a version of django-guardian
# that's only compatible with Django 2.0+. # that's only compatible with Django 2.0+.
if django.VERSION >= (2, 0, 0): if django.VERSION >= (2, 0, 0):
try: try: