summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-10-27 14:20:06 -0400
committerTim Graham <timograham@gmail.com>2015-10-28 10:20:26 -0400
commite5ab75d2fda8ef2617bc13074206e66c980ca51f (patch)
tree7ba0280c938f0aade34b2fef7175869be9101c76 /docs
parentdc193d0f6de6c4eb08c2d160db44b2bf18d96af4 (diff)
Refs #25618 -- Forwardported 1.8.6 release note.
Forwardport of 65bff161ffab1310719bdee495d1e9b35f838c31 from stable/1.8.x
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.8.6.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/releases/1.8.6.txt b/docs/releases/1.8.6.txt
index 75bd79542b..76eb32902d 100644
--- a/docs/releases/1.8.6.txt
+++ b/docs/releases/1.8.6.txt
@@ -41,3 +41,6 @@ Bugfixes
* Fixed crash with ``contrib.postgres.forms.SplitArrayField`` and
``IntegerField`` on invalid value (:ticket:`25597`).
+
+* Added a helpful error message when Django and South migrations exist in the
+ same directory (:ticket:`25618`).