diff options
| author | Marko Tibold | 2011-12-12 09:42:27 -0600 |
|---|---|---|
| committer | Marko Tibold | 2011-12-12 09:42:27 -0600 |
| commit | 386743877909f96af17b9ae35ea18a332e5789af (patch) | |
| tree | a0c32fe861718b995dfd232872f0c9d4af057575 /djangorestframework/views.py | |
| parent | 51c53a8a5c5141f47f3cefab5d3353250422cab3 (diff) | |
| parent | cb8931a014af506c173e9d3b596e2f4aa51600cc (diff) | |
| download | django-rest-framework-386743877909f96af17b9ae35ea18a332e5789af.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'djangorestframework/views.py')
| -rw-r--r-- | djangorestframework/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/views.py b/djangorestframework/views.py index 0a359404..4cc2c7cb 100644 --- a/djangorestframework/views.py +++ b/djangorestframework/views.py @@ -156,7 +156,7 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): # Always add these headers. # # TODO - this isn't actually the correct way to set the vary header, - # also it's currently sub-obtimal for HTTP caching - need to sort that out. + # also it's currently sub-optimal for HTTP caching - need to sort that out. response.headers['Allow'] = ', '.join(self.allowed_methods) response.headers['Vary'] = 'Authenticate, Accept' |