aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide/permissions.md
diff options
context:
space:
mode:
authorEmanuele Pucciarelli2014-04-29 21:41:53 +0200
committerEmanuele Pucciarelli2014-04-29 21:41:53 +0200
commitf54399ea778cd58a0eec111ef9380a7867a7d030 (patch)
tree079623cedf694588b6c57769aef808e49395798f /docs/api-guide/permissions.md
parent8904f179d1bc925d52001497e92b9cd509e65bd5 (diff)
parent161270da992c13ff093048429d3d139f9bd0fc4e (diff)
downloaddjango-rest-framework-f54399ea778cd58a0eec111ef9380a7867a7d030.tar.bz2
Merge remote-tracking branch 'upstream/master'
Conflicts: rest_framework/tests/models.py
Diffstat (limited to 'docs/api-guide/permissions.md')
-rw-r--r--docs/api-guide/permissions.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md
index 6a0f48f4..50f669a2 100644
--- a/docs/api-guide/permissions.md
+++ b/docs/api-guide/permissions.md
@@ -56,7 +56,7 @@ You can also set the authentication policy on a per-view, or per-viewset basis,
using the `APIView` class based views.
from rest_framework.permissions import IsAuthenticated
- from rest_framework.responses import Response
+ from rest_framework.response import Response
from rest_framework.views import APIView
class ExampleView(APIView):