Merge "Rename BlockRestriction -> BlockRestrictionStore and wire it up as a service"

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

Fri, 26 Apr 2019 11:47:47 +0000 (11:47 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 26 Apr 2019 11:47:47 +0000 (11:47 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Apr 2019 11:47:47 +0000 (11:47 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Apr 2019 11:47:47 +0000 (11:47 +0000)
diff --cc includes/MediaWikiServices.php
Simple merge
diff --cc includes/ServiceWiring.php
Simple merge
diff --cc includes/specials/SpecialBlock.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 26 Apr 2019 11:47:47 +0000 (11:47 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 26 Apr 2019 11:47:47 +0000 (11:47 +0000)
		1	2
includes/MediaWikiServices.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/ServiceWiring.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialBlock.php	patch \|	diff1 \|	diff2 \|	blob \| history