rest_framework/compat.py · c53c9eddfe1159a731c1ac879b3f72b1085b2fe9 · edx / django-rest-framework · GitLab

Blame History Permalink

Merge branch 'master' into filters · 34eb18b4
```
Conflicts:
	rest_framework/compat.py
	rest_framework/filters.py
```
Tom Christie committed Oct 19, 2015
34eb18b4

compat.py 6.29 KB