Merge "Update suppressWarning()/restoreWarning() calls"

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

Sun, 11 Feb 2018 22:06:29 +0000 (22:06 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 11 Feb 2018 22:06:29 +0000 (22:06 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 11 Feb 2018 22:06:29 +0000 (22:06 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 11 Feb 2018 22:06:29 +0000 (22:06 +0000)
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc includes/Setup.php
Simple merge
diff --cc includes/api/ApiMain.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 11 Feb 2018 22:06:29 +0000 (22:06 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 11 Feb 2018 22:06:29 +0000 (22:06 +0000)
		1	2
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Setup.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiMain.php	patch \|	diff1 \|	diff2 \|	blob \| history