Merge "Avoid deprecated LinkCache::singleton()"

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

Thu, 14 Jun 2018 23:48:54 +0000 (23:48 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 14 Jun 2018 23:48:54 +0000 (23:48 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Jun 2018 23:48:54 +0000 (23:48 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Jun 2018 23:48:54 +0000 (23:48 +0000)
diff --cc includes/OutputPage.php
Simple merge
diff --cc includes/Title.php
Simple merge
diff --cc includes/page/WikiPage.php
Simple merge
diff --cc includes/parser/CoreParserFunctions.php
Simple merge
diff --cc includes/parser/Parser.php
Simple merge
diff --cc tests/phpunit/MediaWikiTestCase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 14 Jun 2018 23:48:54 +0000 (23:48 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 14 Jun 2018 23:48:54 +0000 (23:48 +0000)
		1	2
includes/OutputPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/CoreParserFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/Parser.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/MediaWikiTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history