summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReedy <reedy@wikimedia.org>2015-12-20 22:10:53 +0000
committerReedy <reedy@wikimedia.org>2015-12-20 23:06:19 +0000
commit977aee41958f5949adf98d5686f54f8d7e3b801e (patch)
treefbd1436472b1d2a310b906ade962f4c9d288beea
parent9fe5ced6faa75472bd3f4ec54eca495bfcd707ff (diff)
Prep 1.25.51.25.5
Change-Id: I995da41b703eab7b6435ab6745d8513b53c533f5
-rw-r--r--RELEASE-NOTES-1.252
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index bf3c5e8336d3..37dd7163892c 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -3,7 +3,7 @@ turn it off. MediaWiki will not work with it enabled.
== MediaWiki 1.25.5 ==
-THIS IS NOT A RELEASE YET!
+This is a maintenance release of the MediaWiki 1.25 branch.
== Changes since 1.25.4 ==
* (T121892) Fix fatal error on some Special pages, introduced in 1.25.4.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9267d3ad7d72..21007c755d68 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@ $wgConfigRegistry = array(
* MediaWiki version number
* @since 1.2
*/
-$wgVersion = '1.25.4';
+$wgVersion = '1.25.5';
/**
* Name of the site. It must be changed in LocalSettings.php