Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559

Conflicts:
	docs/topics/release-notes.md

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/users/serializers.py b/tests/users/serializers.py
new file mode 100644
index 00000000..4893ddb3
--- /dev/null
+++ b/tests/users/serializers.py
@@ -0,0 +1,8 @@
+from rest_framework import serializers
+
+from tests.users.models import User
+
+
+class UserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User