Merge "Introduce PermissionManager service"

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

Fri, 5 Apr 2019 16:45:32 +0000 (16:45 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 5 Apr 2019 16:45:32 +0000 (16:45 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 Apr 2019 16:45:32 +0000 (16:45 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 5 Apr 2019 16:45:32 +0000 (16:45 +0000)
diff --cc includes/ServiceWiring.php
Simple merge
diff --cc includes/Title.php
Simple merge
diff --cc includes/user/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 5 Apr 2019 16:45:32 +0000 (16:45 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 5 Apr 2019 16:45:32 +0000 (16:45 +0000)
		1	2
includes/ServiceWiring.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/user/User.php	patch \|	diff1 \|	diff2 \|	blob \| history