[django/django] 488351: [1.7.x] Fixed #23329 -- Allowed inherited and m2m ...

[GitHub]

Branch: refs/heads/stable/1.7.x
Home: https://github.com/django/django
Commit: 4883516bea2aebff38b193f4c9707928040d0f8a
https://github.com/django/django/commit/4883516bea2aebff38b193f4c9707928040d0f8a
Author: Simon Charette <chare...@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)

Changed paths:
M django/contrib/admin/options.py
A docs/releases/1.4.15.txt
A docs/releases/1.5.10.txt
A docs/releases/1.6.7.txt
M docs/releases/index.txt
M tests/admin_views/admin.py
M tests/admin_views/models.py
M tests/admin_views/tests.py

Log Message:
-----------
[1.7.x] Fixed #23329 -- Allowed inherited and m2m fields to be referenced in the admin.

Thanks to Trac alias Markush2010 and ross for the detailed reports.

Backport of 3cbb7590cb from master