Merge "resourceloader: Support TestModules registration via extension.json"

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

Wed, 6 Feb 2019 00:17:03 +0000 (00:17 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 6 Feb 2019 00:17:03 +0000 (00:17 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 6 Feb 2019 00:17:03 +0000 (00:17 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Feb 2019 00:17:03 +0000 (00:17 +0000)
diff --cc RELEASE-NOTES-1.33
Simple merge
diff --cc includes/resourceloader/ResourceLoader.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 6 Feb 2019 00:17:03 +0000 (00:17 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 6 Feb 2019 00:17:03 +0000 (00:17 +0000)
		1	2
RELEASE-NOTES-1.33	patch \|	diff1 \|	diff2 \|	blob \| history
includes/resourceloader/ResourceLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history