Merge "Convert PermissionManager constructor to use ServiceOptions."

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

Wed, 21 Aug 2019 18:14:12 +0000 (18:14 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 21 Aug 2019 18:14:12 +0000 (18:14 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 Aug 2019 18:14:12 +0000 (18:14 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Aug 2019 18:14:12 +0000 (18:14 +0000)
diff --cc includes/Permissions/PermissionManager.php
Simple merge
diff --cc includes/ServiceWiring.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 21 Aug 2019 18:14:12 +0000 (18:14 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 21 Aug 2019 18:14:12 +0000 (18:14 +0000)
		1	2
includes/Permissions/PermissionManager.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/ServiceWiring.php	patch \|	diff1 \|	diff2 \|	blob \| history