django-rest-framework/rest_framework/utils
Tom Christie 9c41c007af Merge branch 'master' into 2.4.0
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py
2013-12-13 16:32:34 +00:00
..
__init__.py XML cleanup 2013-02-22 19:46:47 +00:00
breadcrumbs.py Fix breadcrumb view names 2013-08-29 20:51:51 +01:00
encoders.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
formatting.py Move view name/description functions into public space 2013-08-19 08:24:27 +01:00
mediatypes.py Cleanup imports 2013-02-04 20:55:35 +00:00