diff options
| author | Nikolaus Schlemm | 2013-05-18 18:34:21 +0200 |
|---|---|---|
| committer | Nikolaus Schlemm | 2013-05-18 18:34:21 +0200 |
| commit | 843ae6023753a0373eb2e6398ddda93e4da74de5 (patch) | |
| tree | 4e24d5c121a226b1ce7cc160f8e8e0c5204cc1b8 /rest_framework/exceptions.py | |
| parent | 7f1cc82f96c2ba4064b28957a8b2d5b313be3c40 (diff) | |
| parent | fecadacab150aab48b8b84f4f0e5340ead74c287 (diff) | |
| download | django-rest-framework-843ae6023753a0373eb2e6398ddda93e4da74de5.tar.bz2 | |
Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options
Conflicts:
rest_framework/tests/fields.py
Diffstat (limited to 'rest_framework/exceptions.py')
0 files changed, 0 insertions, 0 deletions