Merge "Pass $context to 'GetPreferences' hook"

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

Thu, 1 Nov 2018 04:00:23 +0000 (04:00 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 1 Nov 2018 04:00:23 +0000 (04:00 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 1 Nov 2018 04:00:23 +0000 (04:00 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 1 Nov 2018 04:00:23 +0000 (04:00 +0000)
diff --cc RELEASE-NOTES-1.33
Simple merge
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/preferences/DefaultPreferencesFactory.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 1 Nov 2018 04:00:23 +0000 (04:00 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 1 Nov 2018 04:00:23 +0000 (04:00 +0000)
		1	2
RELEASE-NOTES-1.33	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/preferences/DefaultPreferencesFactory.php	patch \|	diff1 \|	diff2 \|	blob \| history