encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-11-06 10:57:36 +03:00
Code Issues Packages Projects Releases Wiki Activity
9c41c007af
django-rest-framework/rest_framework/templates
History
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
..
rest_framework Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00