Merge "Remove deprecated function mw.util.toggleToc"

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

Thu, 17 Apr 2014 15:32:28 +0000 (15:32 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 17 Apr 2014 15:32:28 +0000 (15:32 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 17 Apr 2014 15:32:28 +0000 (15:32 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 17 Apr 2014 15:32:28 +0000 (15:32 +0000)
diff --cc RELEASE-NOTES-1.24
Simple merge
diff --cc includes/parser/Parser.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 17 Apr 2014 15:32:28 +0000 (15:32 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 17 Apr 2014 15:32:28 +0000 (15:32 +0000)
		1	2
RELEASE-NOTES-1.24	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/Parser.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history