Merge "Title::getLinkURL(): Allow expanding PROTO_RELATIVE too"

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

Wed, 20 Jul 2016 21:56:21 +0000 (21:56 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 20 Jul 2016 21:56:21 +0000 (21:56 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Jul 2016 21:56:21 +0000 (21:56 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Jul 2016 21:56:21 +0000 (21:56 +0000)
diff --cc includes/Title.php
Simple merge
diff --cc includes/linker/LinkRenderer.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 20 Jul 2016 21:56:21 +0000 (21:56 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 20 Jul 2016 21:56:21 +0000 (21:56 +0000)
		1	2
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/linker/LinkRenderer.php	patch \|	diff1 \|	diff2 \|	blob \| history