Revert "Applied patches to new WMF 1.21wmf11 branch"

This reverts commit 855d049c75fe303a7a0fcb06dba60170437a694d.

Change-Id: I68f75d9e9cb942f6dc4bdef97a5d5458c9b89875

diff --git a/.gitreview b/.gitreview
index 8d10118..0ec44b8 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=wmf/1.21wmf11
+defaultbranch=master
 defaultrebase=0

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 32b3fea..c67cea6 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion = '1.21wmf11';
+$wgVersion = '1.21alpha';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';