Merge "Make it possible to disable the upload dialog functionality"

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

Mon, 13 Jun 2016 23:38:27 +0000 (23:38 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 13 Jun 2016 23:38:27 +0000 (23:38 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 13 Jun 2016 23:38:27 +0000 (23:38 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 13 Jun 2016 23:38:27 +0000 (23:38 +0000)
diff --cc RELEASE-NOTES-1.28
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
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 13 Jun 2016 23:38:27 +0000 (23:38 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 13 Jun 2016 23:38:27 +0000 (23:38 +0000)
		1	2
RELEASE-NOTES-1.28	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