Merge "(bug 32537) Pre-register default-loaded RL modules in the client-side loader."

author Brion VIBBER <brion@wikimedia.org>

Wed, 25 Apr 2012 19:40:23 +0000 (19:40 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 25 Apr 2012 19:40:23 +0000 (19:40 +0000)
author Brion VIBBER <brion@wikimedia.org>
Wed, 25 Apr 2012 19:40:23 +0000 (19:40 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Apr 2012 19:40:23 +0000 (19:40 +0000)
diff --cc includes/OutputPage.php
Simple merge
diff --cc resources/mediawiki/mediawiki.js
Simple merge
author	Brion VIBBER <brion@wikimedia.org>
	Wed, 25 Apr 2012 19:40:23 +0000 (19:40 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 25 Apr 2012 19:40:23 +0000 (19:40 +0000)
		1	2
includes/OutputPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/mediawiki/mediawiki.js	patch \|	diff1 \|	diff2 \|	blob \| history