From 29d564c238c5c6577b4b1f75203c1c77acdb35dc Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 10 Aug 2022 19:42:00 +0100
Subject: [PATCH] Release note for #6411

---
 CHANGELOG.txt        | 1 +
 docs/releases/4.0.md | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index faeeaeacdd..3bd8f5358f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -159,6 +159,7 @@ Changelog
  * Fix: Missing a outline on dropdown content and malformed tooltip arrow in forced colors mode (Anuja Verma, LB (Ben) Johnston)
  * Fix: Layout issues with reports (including form submissions listings) on md device widths (Akash Kumar Sen, LB (Ben) Johnston)
  * Fix: Layout issue with page explorer's inner header item on small device widths (Akash Kumar Sen)
+ * Fix: Ensure that `BaseSiteSetting` / `BaseGenericSetting` objects can be pickled (Andy Babic)
 
 
 3.0.1 (16.06.2022)
diff --git a/docs/releases/4.0.md b/docs/releases/4.0.md
index 91461ded70..94783ffa90 100644
--- a/docs/releases/4.0.md
+++ b/docs/releases/4.0.md
@@ -167,7 +167,7 @@ The bulk of these enhancements have been from Paarth Agarwal, who has been doing
  * Implement the new chooser widget styles as part of the page editor redesign (Thibaud Colas)
  * Update base Draftail/TextField form designs as part of the page editor redesign (Thibaud Colas)
  * Move commenting trigger to inline toolbar and move block splitting to the block toolbar and command palette only in Draftail (Thibaud Colas)
- 
+
 ### Bug fixes
 
  * Fix issue where `ModelAdmin` index listings with export list enabled would show buttons with an incorrect layout (Josh Woodcock)
@@ -216,6 +216,7 @@ The bulk of these enhancements have been from Paarth Agarwal, who has been doing
  * Resolve MySQL search compatibility issue with Django 4.1 (Andy Chosak)
  * Resolve layout issues with reports (including form submissions listings) on md device widths (Akash Kumar Sen, LB (Ben) Johnston)
  * Resolve Layout issue with page explorer's inner header item on small device widths (Akash Kumar Sen)
+ * Ensure that `BaseSiteSetting` / `BaseGenericSetting` objects can be pickled (Andy Babic)
 
 
 ## Upgrade considerations