From: Chad Horohoe <chadh@wikimedia.org>
Date: Tue, 11 Dec 2012 01:57:34 +0000 (-0500)
Subject: Revert "Applied patches to new WMF 1.21wmf6 branch"
X-Git-Tag: 1.31.0-rc.0~21336
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=7515b0b3daaf07f7d4292c1430d1967e84c44621;p=lhc%2Fweb%2Fwiklou.git

Revert "Applied patches to new WMF 1.21wmf6 branch"

This reverts commit b92b9b62c0c93d16c93541ea1cd5afa5d60eef52.

Change-Id: I4324813533ad984877b58d503aa0dc96010dbd50
---

diff --git a/.gitreview b/.gitreview
index 435b8fd2b9..0ec44b8359 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=wmf/1.21wmf6
+defaultbranch=master
 defaultrebase=0
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e439ac770a..e12b3be3fe 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@ if( !defined( 'MEDIAWIKI' ) ) {
 $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';