diff options
| author | Tom Christie | 2013-08-23 14:39:52 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-08-23 14:39:52 +0100 |
| commit | b72a99fef2c84428240425ed42b1a0b1198631b1 (patch) | |
| tree | a8b248eebeac63972a75a4cb190c473355549929 /rest_framework/renderers.py | |
| parent | 0966a2680ba02e6a4586bd2777ed593fcc66a453 (diff) | |
| parent | e03854ba6a74428675c40d469a7768cc5131035f (diff) | |
| download | django-rest-framework-b72a99fef2c84428240425ed42b1a0b1198631b1.tar.bz2 | |
Merge branch 'display-nested-data' into html-form-renderer
Diffstat (limited to 'rest_framework/renderers.py')
0 files changed, 0 insertions, 0 deletions