Skip to content

Fixed problem with imporing rest_framework.views in apps.py #2678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpadilla merged 1 commit into from
Mar 12, 2015
Merged

Fixed problem with imporing rest_framework.views in apps.py #2678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fixed problem with imporing rest_framework.views in apps.py
  • Loading branch information
@dirkmoors
dirkmoors committed Mar 12, 2015
commit 6c1d0d7ed05941c7a673d1bb3f0e1b56a4b6ab44
2 changes: 1 addition & 1 deletion rest_framework/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from django.template import Context, loader
from django.utils import six
from django.utils.six.moves.urllib import parse as urlparse
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import OrderedDict
from rest_framework.exceptions import NotFound
from rest_framework.response import Response
Expand Down