Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/models/fields/related.py

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/admin_docs/views.py b/tests/admin_docs/views.py
new file mode 100644
index 0000000000..e47177c37f
--- /dev/null
+++ b/tests/admin_docs/views.py
@@ -0,0 +1,13 @@
+from django.http import HttpResponse
+from django.utils.decorators import decorator_from_middleware
+from django.views.generic import View
+from django.contrib.admindocs.middleware import XViewMiddleware
+
+xview_dec = decorator_from_middleware(XViewMiddleware)
+
+def xview(request):
+    return HttpResponse()
+
+class XViewClass(View):
+    def get(self, request):
+        return HttpResponse()