encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 17:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
34eb18b498
django-rest-framework/rest_framework/templates
History
Tom Christie 34eb18b498 Merge branch 'master' into filters 
Conflicts:
	rest_framework/compat.py
	rest_framework/filters.py
2015-10-19 13:14:42 +01:00
..
rest_framework Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00