Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion rest_framework_json_api/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import django
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import NoReverseMatch
if django.VERSION >= (1, 10):
from django.urls import NoReverseMatch
else:
from django.core.urlresolvers import NoReverseMatch
from django.db.models import Model
from django.db.models.query import QuerySet
from django.db.models.manager import Manager
Expand Down