diff options
| author | Tom Christie | 2012-10-29 17:09:01 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-10-29 17:09:01 +0000 |
| commit | 215edc5dfabd9cf084adb68269b625e52cc35cda (patch) | |
| tree | b6ef9c0561b2b50a8ecb39e1da1723a4f833a713 /rest_framework/negotiation.py | |
| parent | d206c686a643b7cc720743d8dab207e8ad0280f8 (diff) | |
| parent | 343da8e3cf0d50761cd5b15e168a104aad4e0ac5 (diff) | |
| download | django-rest-framework-215edc5dfabd9cf084adb68269b625e52cc35cda.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'rest_framework/negotiation.py')
0 files changed, 0 insertions, 0 deletions