diff options
| author | Marko Tibold | 2012-11-29 01:10:32 +0100 |
|---|---|---|
| committer | Marko Tibold | 2012-11-29 01:10:32 +0100 |
| commit | 968f4a5ca40d8e85ff6a77e9263e0563285abe8f (patch) | |
| tree | cae5a35c4c5cacabb5274ebce94a8b55318eea27 /docs/api-guide/parsers.md | |
| parent | 60def44ee2ae803e23f7e440a6855c6883c1a882 (diff) | |
| parent | 5cd64cc551c8c519bc9797ebf4336bd8c6128250 (diff) | |
| download | django-rest-framework-968f4a5ca40d8e85ff6a77e9263e0563285abe8f.tar.bz2 | |
Merge branch 'custom-serializer-form-class' of https://github.com/ludwigkraatz/django-rest-framework into mergebranch#390
Conflicts:
rest_framework/fields.py
rest_framework/renderers.py
Manually solved
Diffstat (limited to 'docs/api-guide/parsers.md')
0 files changed, 0 insertions, 0 deletions