summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunal Mehta <legoktm@gmail.com>2015-05-25 22:55:26 +0200
committerKunal Mehta <legoktm@gmail.com>2015-05-25 22:56:22 +0200
commit76e04b004b016f78613767b3d0cdbd09aaabb5bf (patch)
tree740a762e1e2eb5145209b3fc111377b8311ac075
parentf5c3ee0939e2b5c07a7099caaa6f0aa4102eceb7 (diff)
Bump version + release notes for 1.25.11.25.1
Change-Id: I1b0da1a5c3059b48afda1ce0ed580a04905ef912
-rw-r--r--RELEASE-NOTES-1.258
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 9 insertions, 1 deletions
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 0e68b1e9c192..223cf97cadf1 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -1,6 +1,14 @@
Security reminder: If you have PHP's register_globals option set, you must
turn it off. MediaWiki will not work with it enabled.
+== MediaWiki 1.25.1 ==
+
+This is a bug fix release of the MediaWiki 1.25 branch.
+
+== Changes since 1.25.1 ==
+
+* (T100351) Fix syntax errors in extension.json of ConfirmEdit extension
+
== MediaWiki 1.25 ==
=== Configuration changes in 1.25 ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 3ca9064219a8..010c471c0af1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@ $wgConfigRegistry = array(
* MediaWiki version number
* @since 1.2
*/
-$wgVersion = '1.25.0';
+$wgVersion = '1.25.1';
/**
* Name of the site. It must be changed in LocalSettings.php