Merge "Enable users to watch category membership changes"

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

Fri, 14 Aug 2015 06:58:48 +0000 (06:58 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 14 Aug 2015 06:58:48 +0000 (06:58 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 14 Aug 2015 06:58:48 +0000 (06:58 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 14 Aug 2015 06:58:48 +0000 (06:58 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/Preferences.php
Simple merge
diff --cc includes/api/i18n/en.json
Simple merge
diff --cc includes/page/WikiPage.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>
	Fri, 14 Aug 2015 06:58:48 +0000 (06:58 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 14 Aug 2015 06:58:48 +0000 (06:58 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Preferences.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history