Merge "Add preference for watching uploaded files"

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

Tue, 12 Apr 2016 17:29:29 +0000 (17:29 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 12 Apr 2016 17:29:29 +0000 (17:29 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 12 Apr 2016 17:29:29 +0000 (17:29 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 12 Apr 2016 17:29:29 +0000 (17:29 +0000)
diff --cc RELEASE-NOTES-1.27
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/Preferences.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>
	Tue, 12 Apr 2016 17:29:29 +0000 (17:29 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 12 Apr 2016 17:29:29 +0000 (17:29 +0000)
		1	2
RELEASE-NOTES-1.27	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Preferences.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history