Merge "Replace wfGetLB"

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

Fri, 4 May 2018 19:08:32 +0000 (19:08 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 4 May 2018 19:08:32 +0000 (19:08 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 May 2018 19:08:32 +0000 (19:08 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 4 May 2018 19:08:32 +0000 (19:08 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc tests/parser/ParserTestRunner.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 4 May 2018 19:08:32 +0000 (19:08 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 4 May 2018 19:08:32 +0000 (19:08 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/ParserTestRunner.php	patch \|	diff1 \|	diff2 \|	blob \| history