From 76435fa4750f0fa9b7dfafb5aa848946a68f07e3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 13 Aug 2018 11:19:09 +0100
Subject: [PATCH] Add release notes for 1.12.5

---
 CHANGELOG.txt            |  7 +++++++
 docs/releases/1.12.5.rst | 17 +++++++++++++++++
 docs/releases/index.rst  |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 docs/releases/1.12.5.rst

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6bbe27ab6..4138c8631 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.12.5 (13.08.2018)
+~~~~~~~~~~~~~~~~~~~
+
+ * Fix: Pin django-taggit to <0.23 to restore Django 1.8 compatibility (Matt Westcott)
+ * Fix: Mark Beautiful Soup 4.6.1 as incompatible due to bug in formatting empty elements (Matt Westcott)
+
+
 1.12.4 (04.07.2018)
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releases/1.12.5.rst b/docs/releases/1.12.5.rst
new file mode 100644
index 000000000..1b77483ce
--- /dev/null
+++ b/docs/releases/1.12.5.rst
@@ -0,0 +1,17 @@
+============================
+Wagtail 1.12.5 release notes
+============================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+What's new
+==========
+
+Bug fixes
+~~~~~~~~~
+
+ * Pin django-taggit to <0.23 to restore Django 1.8 compatibility (Matt Westcott)
+ * Mark Beautiful Soup 4.6.1 as incompatible due to bug in formatting empty elements (Matt Westcott)
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 99148bc5f..c3308b22a 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -5,6 +5,7 @@ Release notes
    :maxdepth: 1
 
    upgrading
+   1.12.5
    1.12.4
    1.12.3
    1.12.2