From 1a4046a6764d7d17bc6b35462b743064c4e2ec8f Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 29 Jun 2018 15:14:19 +0100
Subject: [PATCH] Copy 1.12.4 release notes to master

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d4d2d4583d..3869108bc3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -229,6 +229,12 @@ Changelog
  * Fix: API listing views no longer fail when no site records are defined (Karl Hobley)
 
 
+1.12.4 (IN DEVELOPMENT)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* Fix: Fix support of `ATOMIC_REBUILD` for projects with Elasticsearch client >=1.7.0 (Mikalai Radchuk)
+
+
 1.12.3 (17.11.2017)
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releases/1.12.4.rst b/docs/releases/1.12.4.rst
new file mode 100644
index 0000000000..d8001f661e
--- /dev/null
+++ b/docs/releases/1.12.4.rst
@@ -0,0 +1,16 @@
+=============================================
+Wagtail 1.12.4 release notes - IN DEVELOPMENT
+=============================================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+What's new
+==========
+
+Bug fixes
+~~~~~~~~~
+
+* Fix support of ``ATOMIC_REBUILD`` for projects with Elasticsearch client ``>=1.7.0`` (Mikalai Radchuk)
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 1d937a165b..5acdcdb9dd 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -12,6 +12,7 @@ Release notes
    2.0
    1.13.1
    1.13
+   1.12.4
    1.12.3
    1.12.2
    1.12.1