diff options
| author | Marko Tibold | 2012-10-22 20:09:36 +0200 |
|---|---|---|
| committer | Marko Tibold | 2012-10-22 20:09:36 +0200 |
| commit | d1e05ea8d4b5d7f94bde9a574196505aa823a6ff (patch) | |
| tree | cf155b8a239644243d8198c69ec15070627b4ed8 /mkdocs.py | |
| parent | ab1a12bfecf49061cb31dff05add26d96078771e (diff) | |
| parent | 95a670de41a246777bc1e448dca8cc576b7b86ea (diff) | |
| download | django-rest-framework-d1e05ea8d4b5d7f94bde9a574196505aa823a6ff.tar.bz2 | |
Merge commit '95a670de41a246777bc1e448dca8cc576b7b86ea' into BrowsableAPIRenderer
Conflicts:
rest_framework/renderers.py - manually resolved conflict
Diffstat (limited to 'mkdocs.py')
0 files changed, 0 insertions, 0 deletions