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 9801e04..d3c24ca 100644 (file)
--- 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';