From 58604013031a72c359e2ed9b9ea70c1c38b908f0 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 13 Aug 2018 14:29:53 +0100
Subject: [PATCH] Release notes for 1.12.6

Conflicts:
	CHANGELOG.txt
	docs/releases/index.rst
---
 CHANGELOG.txt            |  6 ++++++
 docs/releases/1.12.6.rst | 16 ++++++++++++++++
 docs/releases/index.rst  |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 docs/releases/1.12.6.rst

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ba818fbdc..7d89477c6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -60,6 +60,12 @@ Changelog
  * Fix: Custom PageManagers now return the correct PageQuerySet subclass (Matt Westcott)
 
 
+1.12.6 (13.08.2018)
+~~~~~~~~~~~~~~~~~~~
+
+ * Fix: Pin Beautiful Soup to 4.6.0 due to further regressions in formatting empty elements (Matt Westcott)
+
+
 1.12.5 (13.08.2018)
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releases/1.12.6.rst b/docs/releases/1.12.6.rst
new file mode 100644
index 000000000..5c0e0928c
--- /dev/null
+++ b/docs/releases/1.12.6.rst
@@ -0,0 +1,16 @@
+============================
+Wagtail 1.12.6 release notes
+============================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+What's new
+==========
+
+Bug fixes
+~~~~~~~~~
+
+ * Pin Beautiful Soup to 4.6.0 due to further regressions in formatting empty elements (Matt Westcott)
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 026001427..4218ef1fb 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -9,6 +9,7 @@ Release notes
    1.13.2
    1.13.1
    1.13
+   1.12.6
    1.12.5
    1.12.4
    1.12.3