From 0bea246d2cf628c69f971e5adfdecfdacc6368d7 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Tue, 24 Mar 2020 17:24:57 +0000
Subject: [PATCH] Bump and prep 1.31.7

Change-Id: I3feba3ab474d69a9acbae5e2c1ecd388784d9df0
---
 RELEASE-NOTES-1.31   | 5 ++++-
 includes/Defines.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 6625cd23c4..51d35987c8 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -1,6 +1,6 @@
 == MediaWiki 1.31.7 ==
 
-THIS IS NOT A RELEASE YET
+This is a security and maintenance release of the MediaWiki 1.31 branch.
 
 === Changes since MediaWiki 1.31.6 ===
 * (T193565, T234022) Re-add DB domain sanity checks to LoadBalancer.
@@ -10,6 +10,9 @@ THIS IS NOT A RELEASE YET
 * (T247215) Fix output of RecountCategories::doWork().
 * Add check for page existence to view.php maintenance script.
 * (T247580) Disable some broken Selenium tests.
+* (T236509) SECURITY: Fix HTML escaping in UserGroupMembership::getLink().
+* (T246602) SECURITY: jquery.makeCollapsible allows applying event handler to any
+  CSS selector.
 
 == MediaWiki 1.31.6 ==
 
diff --git a/includes/Defines.php b/includes/Defines.php
index b4140c3024..214eba5571 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -35,9 +35,9 @@ use Wikimedia\Rdbms\IDatabase;
  *
  * This replaces the the $wgVersion global found in earlier versions.
  *
- * @since 1.35
+ * @since 1.31.7
  */
-define( 'MW_VERSION', '1.31.6' );
+define( 'MW_VERSION', '1.31.7' );
 
 # Obsolete aliases
 /**
-- 
2.20.1