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/views.py b/tests/views.py
new file mode 100644
index 00000000..55935e92
--- /dev/null
+++ b/tests/views.py
@@ -0,0 +1,8 @@
+from rest_framework import generics
+from .models import NullableForeignKeySource
+from .serializers import NullableFKSourceSerializer
+
+
+class NullableFKSourceDetail(generics.RetrieveUpdateDestroyAPIView):
+    model = NullableForeignKeySource
+    model_serializer_class = NullableFKSourceSerializer