Merge "Hide TOC with CSS instead of JavaScript"

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

Wed, 11 Jul 2018 20:36:22 +0000 (20:36 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 11 Jul 2018 20:36:22 +0000 (20:36 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 11 Jul 2018 20:36:22 +0000 (20:36 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 11 Jul 2018 20:36:22 +0000 (20:36 +0000)
diff --cc includes/Linker.php
Simple merge
diff --cc includes/api/ApiHelp.php
Simple merge
diff --cc includes/skins/Skin.php
Simple merge
diff --cc resources/Resources.php
Simple merge
diff --cc tests/parser/parserTests.txt
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 11 Jul 2018 20:36:22 +0000 (20:36 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 11 Jul 2018 20:36:22 +0000 (20:36 +0000)
		1	2
includes/Linker.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiHelp.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/skins/Skin.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/parserTests.txt	patch \|	diff1 \|	diff2 \|	blob \| history