From 4f59b215d8f34b8ff79a0f0c0a04da7403459ca3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 18 Nov 2015 13:04:50 +0000
Subject: [PATCH] Release note for #468

---
 CHANGELOG.txt         | 1 +
 CONTRIBUTORS.rst      | 1 +
 docs/releases/1.3.rst | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index afadc901fd..42ff37fc7b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Changelog
 1.3 (xx.xx.xxxx)
 ~~~~~~~~~~~~~~~~
 
+ * Added `WAGTAIL_PASSWORD_RESET_ENABLED` setting to allow password resets to be disabled independently of the password management interface (John Draper)
  * Fix: HTTP cache purge now works again on Python 2 (Mitchel Cabuloy)
 
 1.2 (12.11.2015)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index d92d3a0be9..9552b0f584 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -78,6 +78,7 @@ Contributors
 * Denis Voskvitsov
 * Kyle Stratis
 * Sergey Nikitin
+* John Draper
 
 
 Translators
diff --git a/docs/releases/1.3.rst b/docs/releases/1.3.rst
index 376b94fc67..072f85ebae 100644
--- a/docs/releases/1.3.rst
+++ b/docs/releases/1.3.rst
@@ -14,6 +14,8 @@ What's new
 Minor features
 ~~~~~~~~~~~~~~
 
+ * Added ``WAGTAIL_PASSWORD_RESET_ENABLED`` setting to allow password resets to be disabled independently of the password management interface (John Draper)
+
 
 Bug fixes
 ~~~~~~~~~