Merge "Update wording for RC and Watchlist UI opt-out option"

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

Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)
diff --cc includes/preferences/DefaultPreferencesFactory.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)
		1	2
includes/preferences/DefaultPreferencesFactory.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history