summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Horohoe <chadh@wikimedia.org>2015-05-25 14:00:02 +0200
committerChad Horohoe <chadh@wikimedia.org>2015-05-25 14:04:19 +0200
commitf5c3ee0939e2b5c07a7099caaa6f0aa4102eceb7 (patch)
treef102893ff1f37a2ad9798e99248c927b1b4d8573
parent4659ae302feca8bf340add6f8e85492698080ee7 (diff)
Prep for 1.25.0 general release, no more RCs1.25.0
Change-Id: I27b0b22594ae81fb3cc190f1dbd25e84f6e2ccd5
-rw-r--r--RELEASE-NOTES-1.255
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 1 insertions, 6 deletions
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index e74f226581ef..0e68b1e9c192 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -3,11 +3,6 @@ turn it off. MediaWiki will not work with it enabled.
== MediaWiki 1.25 ==
-THIS IS NOT A RELEASE YET
-
-MediaWiki 1.25 is an alpha-quality branch and is not recommended for use in
-production.
-
=== Configuration changes in 1.25 ===
* $wgPageShowWatchingUsers was removed.
* $wgLocalVirtualHosts has been added to replace $wgConf->localVHosts.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 48a595d22519..3ca9064219a8 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-rc.1';
+$wgVersion = '1.25.0';
/**
* Name of the site. It must be changed in LocalSettings.php