aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_multitable_inheritance.py
diff options
context:
space:
mode:
authorTom Christie2015-02-06 14:39:31 +0000
committerTom Christie2015-02-06 14:39:31 +0000
commita435b1b3553975a280ec33d709a6aeee1ee415e8 (patch)
tree5868eacc15665a3662f77b94d4c5480b66babad5 /tests/test_multitable_inheritance.py
parent1f996128458570a909d13f15c3d739fb12111984 (diff)
parent7f801b9a01fa7df3b081ddec803bd0d34cc3b35b (diff)
downloaddjango-rest-framework-a435b1b3553975a280ec33d709a6aeee1ee415e8.tar.bz2
Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1
Diffstat (limited to 'tests/test_multitable_inheritance.py')
0 files changed, 0 insertions, 0 deletions