summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.11.13.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/releases/1.11.13.txt b/docs/releases/1.11.13.txt
index f72ccd8fd2..4c55454bcd 100644
--- a/docs/releases/1.11.13.txt
+++ b/docs/releases/1.11.13.txt
@@ -15,3 +15,8 @@ Bugfixes
* Fixed crashes in ``django.contrib.admindocs`` when a view is a callable
object, such as ``django.contrib.syndication.views.Feed`` (:ticket:`29296`).
+
+* Fixed a regression in Django 1.11.12 where ``QuerySet.values()`` or
+ ``values_list()`` after combining an annotated and unannotated queryset with
+ ``union()``, ``difference()``, or ``intersection()`` crashed due to mismatching
+ columns (:ticket:`29286`).