From: Catrope <roan.kattouw@gmail.com>
Date: Mon, 30 Apr 2012 21:01:29 +0000 (-0700)
Subject: Revert "Applied patches to new WMF 1.20wmf2 branch"
X-Git-Tag: 1.31.0-rc.0~23775
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=23a2bf9a76ae10e9381fa1f45b37fca9e46e3298;p=lhc%2Fweb%2Fwiklou.git

Revert "Applied patches to new WMF 1.20wmf2 branch"

This reverts commit 3c039d0aada049122d9635dccf738464de00dc48.

Change-Id: Ia231f5da44a2bdeb2d51c4b97177fa279336a168
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9801e04ed1..d3c24ca301 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration;
 /** @endcond */
 
 /** MediaWiki version number */
-$wgVersion = '1.20wmf2';
+$wgVersion = '1.20alpha';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';