aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/test_serializer.py
diff options
context:
space:
mode:
authorTom Christie2014-03-06 20:33:27 +0000
committerTom Christie2014-03-06 20:33:27 +0000
commit2090f452b224e60853b40e73d1d0e9aad58cd24a (patch)
tree9550083d51dce99acf2e744e85d891dd803d645c /rest_framework/tests/test_serializer.py
parentef94861c2d31592c3760a0c0758beb084f452c03 (diff)
parent34887ed75625a58d00c986b3ea5526877f4724b2 (diff)
downloaddjango-rest-framework-2090f452b224e60853b40e73d1d0e9aad58cd24a.tar.bz2
Merge pull request #1455 from ericbuehl/master
don't implicitly import provider.oauth2
Diffstat (limited to 'rest_framework/tests/test_serializer.py')
0 files changed, 0 insertions, 0 deletions