summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Horohoe <chadh@wikimedia.org>2015-11-25 09:07:38 -0800
committerChad Horohoe <chadh@wikimedia.org>2015-11-25 09:07:38 -0800
commit365e22ee61035f953b47387af92ef832f09d5982 (patch)
treee04b69f4f2eca8333bcb2edc095ff86769e40f2e
parentbb06e97eb21504d210500211ca9d77e89bbdd6d0 (diff)
Prep REL1_26 for general release1.26.0
Change-Id: Ia26f820c14891b97ee9a7c3cebf490273d8e6c7d
-rw-r--r--RELEASE-NOTES-1.265
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 1 insertions, 6 deletions
diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index ac2f947c2d85..81405f501a12 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -3,11 +3,6 @@ turn it off. MediaWiki will not work with it enabled.
== MediaWiki 1.26 ==
-THIS IS NOT A RELEASE YET
-
-MediaWiki 1.26 is an alpha-quality branch and is not recommended for use in
-production.
-
=== Configuration changes in 1.26 ===
* $wgPasswordResetRoutes['email'] = true by default.
* $wgEnableParserCache was deprecated, set $wgParserCacheType to CACHE_NONE
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0efcb035dc36..268a8d196c01 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@ $wgConfigRegistry = array(
* MediaWiki version number
* @since 1.2
*/
-$wgVersion = '1.26alpha';
+$wgVersion = '1.26.0';
/**
* Name of the site. It must be changed in LocalSettings.php