diff options
| author | Tom Christie | 2013-01-22 09:11:38 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-01-22 09:11:38 +0000 |
| commit | b7ab2aee46c718f683b19eefba1b48f233da40e4 (patch) | |
| tree | 1af09c7dbcc939c749d30adf25b14d232200f44f /rest_framework/exceptions.py | |
| parent | 65b62d64ec54b528b62a1500b8f6ffe216d45c09 (diff) | |
| parent | e29ba356f054222893655901923811bd9675d4cc (diff) | |
| download | django-rest-framework-b7ab2aee46c718f683b19eefba1b48f233da40e4.tar.bz2 | |
Merge branch 'master' into unauthenticated_response
Conflicts:
docs/api-guide/authentication.md
Diffstat (limited to 'rest_framework/exceptions.py')
0 files changed, 0 insertions, 0 deletions