serializers.py
19.4 KB
-
Merge remote-tracking branch 'tom/master' · 8ac77eaa
Conflicts: rest_framework/serializers.py rest_framework/tests/serializer.py
Michal Dvorak (cen38289) committed
Conflicts: rest_framework/serializers.py rest_framework/tests/serializer.py