test_serializer.py
69.1 KB
-
Merge remote-tracking branch 'origin/master' into 2.4.0 · 56b43903
Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py
Xavier Ordoquy committed
Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py