Merge "Add a hook into LanguageConverter#getPreferredVariant() to allow extensions...

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

Tue, 23 Jan 2018 23:01:34 +0000 (23:01 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 23 Jan 2018 23:01:34 +0000 (23:01 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Jan 2018 23:01:34 +0000 (23:01 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Jan 2018 23:01:34 +0000 (23:01 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc languages/LanguageConverter.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 23 Jan 2018 23:01:34 +0000 (23:01 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 23 Jan 2018 23:01:34 +0000 (23:01 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
languages/LanguageConverter.php	patch \|	diff1 \|	diff2 \|	blob \| history