Merge "resourceloader: Remove support for raw modules"

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

Thu, 27 Jun 2019 07:02:38 +0000 (07:02 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 27 Jun 2019 07:02:38 +0000 (07:02 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Jun 2019 07:02:38 +0000 (07:02 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 27 Jun 2019 07:02:38 +0000 (07:02 +0000)
diff --cc includes/resourceloader/ResourceLoaderStartUpModule.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 27 Jun 2019 07:02:38 +0000 (07:02 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 27 Jun 2019 07:02:38 +0000 (07:02 +0000)
		1	2
includes/resourceloader/ResourceLoaderStartUpModule.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history