rest_framework/renderers.py · 0aed70dc8b9bf2bf6c6bbd540ffadfae9f74bbaa · edx / django-rest-framework · GitLab

Blame History Permalink

Merge commit '95a670de' into BrowsableAPIRenderer · d1e05ea8
```
Conflicts:
	rest_framework/renderers.py - manually resolved conflict
```
Marko Tibold committed Oct 22, 2012
d1e05ea8

renderers.py 14.6 KB