Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332904 )

Change subject: Add twocolconflict to wgBetaFeaturesWhitelist
......................................................................

Add twocolconflict to wgBetaFeaturesWhitelist

Needs a +1 from Greg Grossmeier or James Forrester.

Bug: T150184
Change-Id: I3bd5a9d0e093c243effda5b01efdb0c9c6f69789
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/04/332904/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 91db1aa..a88aa70 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12998,6 +12998,7 @@
                'ores-enabled',                             // [Research] 
2017-05-10 - ORES
                'revisionslider',                           // [WMDE] 
2017-05-08 - RevisionSlider
                'visualeditor-newwikitext',                 // [Editing] 
2017-05-29 – New wikitext editor
+               'twocolconflict',                           // [WMDE] 
2017-07-18 – New edit conflict view
        ],
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bd5a9d0e093c243effda5b01efdb0c9c6f69789
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to