Merge "resourceloader: Reduce width of module hash from 7 chars to 5"

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

Tue, 3 Sep 2019 19:21:39 +0000 (19:21 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 3 Sep 2019 19:21:39 +0000 (19:21 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 3 Sep 2019 19:21:39 +0000 (19:21 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Sep 2019 19:21:39 +0000 (19:21 +0000)
diff --cc includes/resourceloader/ResourceLoaderStartUpModule.php
Simple merge
diff --cc resources/src/startup/mediawiki.js
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 3 Sep 2019 19:21:39 +0000 (19:21 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 3 Sep 2019 19:21:39 +0000 (19:21 +0000)
		1	2
includes/resourceloader/ResourceLoaderStartUpModule.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/startup/mediawiki.js	patch \|	diff1 \|	diff2 \|	blob \| history