Merge "Segregate right to edit sitewide CSS/JS"

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

Thu, 26 Jul 2018 22:26:11 +0000 (22:26 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 26 Jul 2018 22:26:11 +0000 (22:26 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 26 Jul 2018 22:26:11 +0000 (22:26 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jul 2018 22:26:11 +0000 (22:26 +0000)
diff --cc RELEASE-NOTES-1.32
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/Title.php
Simple merge
diff --cc includes/installer/Installer.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 26 Jul 2018 22:26:11 +0000 (22:26 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 26 Jul 2018 22:26:11 +0000 (22:26 +0000)
		1	2
RELEASE-NOTES-1.32	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/installer/Installer.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history