Merge "registration: Support Change/RemoveCredentialsBlacklist in extension.json"

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

Fri, 24 Jun 2016 14:34:06 +0000 (14:34 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 24 Jun 2016 14:34:06 +0000 (14:34 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Jun 2016 14:34:06 +0000 (14:34 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Jun 2016 14:34:06 +0000 (14:34 +0000)
diff --cc docs/extension.schema.json
Simple merge
diff --cc includes/registration/ExtensionProcessor.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 24 Jun 2016 14:34:06 +0000 (14:34 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 24 Jun 2016 14:34:06 +0000 (14:34 +0000)
		1	2
docs/extension.schema.json	patch \|	diff1 \|	diff2 \|	blob \| history
includes/registration/ExtensionProcessor.php	patch \|	diff1 \|	diff2 \|	blob \| history