Reedy has submitted this change and it was merged.

Change subject: Revert "Applied patches to new WMF 1.21wmf11 branch"
......................................................................


Revert "Applied patches to new WMF 1.21wmf11 branch"

This reverts commit 855d049c75fe303a7a0fcb06dba60170437a694d.

Change-Id: I68f75d9e9cb942f6dc4bdef97a5d5458c9b89875
---
M .gitreview
M includes/DefaultSettings.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Reedy: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/.gitreview b/.gitreview
index 8d10118..0ec44b8 100644
--- 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
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@
 $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';

-- 
To view, visit https://gerrit.wikimedia.org/r/52064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I68f75d9e9cb942f6dc4bdef97a5d5458c9b89875
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to