summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/2.2.1.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/releases/2.2.1.txt b/docs/releases/2.2.1.txt
index 98f800d455..9696488e14 100644
--- a/docs/releases/2.2.1.txt
+++ b/docs/releases/2.2.1.txt
@@ -59,3 +59,8 @@ Bugfixes
* Increased the default timeout when using ``Watchman`` to 5 seconds to prevent
falling back to ``StatReloader`` on larger projects and made it customizable
via the ``DJANGO_WATCHMAN_TIMEOUT`` environment variable (:ticket:`30361`).
+
+* Fixed a regression in Django 2.2 that caused a crash when migrating
+ permissions for proxy models if the target permissions already existed. For
+ example, when a permission had been created manually or a model had been
+ migrated from concrete to proxy (:ticket:`30351`).