summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-08-24 11:52:58 -0400
committerTim Graham <timograham@gmail.com>2015-08-28 09:03:34 -0400
commit3cc67a637a3cd1426d2ac87d7418600fa247ebb2 (patch)
treef28b96aee6830482ee067f58f85b8212577a69b9 /docs
parent4f83bfa9e5ef10c6c9711ad529630d09a06ef413 (diff)
[1.8.x] Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor.
Backport of 9607a0404188bbe612f05216f5a82df26f4b4e80 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.8.5.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/releases/1.8.5.txt b/docs/releases/1.8.5.txt
index 3f1674b979..543e8824be 100644
--- a/docs/releases/1.8.5.txt
+++ b/docs/releases/1.8.5.txt
@@ -13,5 +13,9 @@ Bugfixes
field that is both a foreign and primary key (:ticket:`24951`).
* Fixed a migrations crash with ``GenericForeignKey`` (:ticket:`25040`).
+
* Made ``translation.override()`` clear the overridden language when a
translation isn't initially active (:ticket:`25295`).
+
+* Fixed crash when using a value in ``ModelAdmin.list_display`` that clashed
+ with a reverse field on the model (:ticket:`25299`).