Merge "(bug 44385) move jquery.collapsibleTabs module to Vector extension"

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

Fri, 15 Feb 2013 18:55:33 +0000 (18:55 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 15 Feb 2013 18:55:33 +0000 (18:55 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Feb 2013 18:55:33 +0000 (18:55 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Feb 2013 18:55:33 +0000 (18:55 +0000)
diff --cc RELEASE-NOTES-1.21
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 15 Feb 2013 18:55:33 +0000 (18:55 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 15 Feb 2013 18:55:33 +0000 (18:55 +0000)
		1	2
RELEASE-NOTES-1.21	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history