Merge "Special:Preferences: Create flag to enable OOjs UI"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 8 May 2018 21:32:01 +0000 (21:32 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 8 May 2018 21:32:01 +0000 (21:32 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 May 2018 21:32:01 +0000 (21:32 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 8 May 2018 21:32:01 +0000 (21:32 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
diff --cc resources/Resources.php
Simple merge
diff --cc tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 8 May 2018 21:32:01 +0000 (21:32 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 8 May 2018 21:32:01 +0000 (21:32 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php	patch \|	diff1 \|	diff2 \|	blob \| history