Revert "Applied patches to new WMF 1.21wmf6 branch"

This reverts commit b92b9b62c0c93d16c93541ea1cd5afa5d60eef52.

Change-Id: I4324813533ad984877b58d503aa0dc96010dbd50

diff --git a/.gitreview b/.gitreview
index 435b8fd..0ec44b8 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git

-defaultbranch=wmf/1.21wmf6
+defaultbranch=master

 defaultrebase=0
 defaultrebase=0

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e439ac7..e12b3be 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@ if( !defined( 'MEDIAWIKI' ) ) {
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */

-$wgVersion = '1.21wmf6';
+$wgVersion = '1.21alpha';

 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';