From c42e4e736a587dc9858fe55fb972aefaa065867d Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Wed, 28 Oct 2015 11:25:25 -0400
Subject: Fixed #25622 -- Accounted for generic relations in the admin to field
 validation

Thanks to Jonathan Liuti for the report and Tim Graham for the review.

Conflicts:
	django/contrib/admin/options.py
---
 docs/releases/1.8.6.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs')

diff --git a/docs/releases/1.8.6.txt b/docs/releases/1.8.6.txt
index 3383e253d0..fef0e7c2d0 100644
--- a/docs/releases/1.8.6.txt
+++ b/docs/releases/1.8.6.txt
@@ -48,3 +48,6 @@ Bugfixes
 * Fixed a regression in ``URLValidator`` that allowed URLs with consecutive
   dots in the domain section (like ``http://example..com/``) to pass
   (:ticket:`25620`).
+
+* Fixed a crash with ``GenericRelation`` and
+  ``BaseModelAdmin.to_field_allowed`` (:ticket:`25622`).
-- 
cgit v1.3