Merge "Add missing return types to User::getOption()"

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

Fri, 23 Mar 2018 01:41:28 +0000 (01:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 23 Mar 2018 01:41:28 +0000 (01:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Mar 2018 01:41:28 +0000 (01:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Mar 2018 01:41:28 +0000 (01:41 +0000)
diff --cc includes/user/User.php
Simple merge
diff --cc tests/phpunit/includes/user/UserTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 23 Mar 2018 01:41:28 +0000 (01:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 23 Mar 2018 01:41:28 +0000 (01:41 +0000)
		1	2
includes/user/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/user/UserTest.php	patch \|	diff1 \|	diff2 \|	blob \| history