diff options
| author | Ethan Fremen | 2013-06-12 14:23:20 -0700 |
|---|---|---|
| committer | Ethan Fremen | 2013-06-12 14:23:20 -0700 |
| commit | 2ed79b6dc626cb2fcc1bfc119ef5757c590bb983 (patch) | |
| tree | 2168c40e527b3ff9cc54fbd14fdb823799bbf280 /rest_framework/generics.py | |
| parent | 0e75bcd2592caa8862e0b0166a6b851a3eada749 (diff) | |
| parent | 1cc2a7b25e78fcb41f44dc5b580f0f00a0a6318a (diff) | |
| download | django-rest-framework-2ed79b6dc626cb2fcc1bfc119ef5757c590bb983.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 2 |
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: |