aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/generics.py
diff options
context:
space:
mode:
authorTom Christie2013-06-14 12:44:04 +0100
committerTom Christie2013-06-14 12:44:04 +0100
commit702ec128ba2880aba14a1d55b87b83deaa11055d (patch)
treec35a3e4cf4c17e31671cc484b3322e94f22cfe49 /rest_framework/generics.py
parent34f34f40b89080936ac8881ba9e77836a2641153 (diff)
parent982411e6f44e4135e837e4896d902a01f543dec4 (diff)
downloaddjango-rest-framework-702ec128ba2880aba14a1d55b87b83deaa11055d.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework/generics.py')
-rw-r--r--rest_framework/generics.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 80efad01..99e9782e 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -212,7 +212,7 @@ class GenericAPIView(views.APIView):
You may want to override this if you need to provide different
serializations depending on the incoming request.
- (Eg. admins get full serialization, others get basic serilization)
+ (Eg. admins get full serialization, others get basic serialization)
"""
serializer_class = self.serializer_class
if serializer_class is not None: