Merge "Remove inadequate render-blocking styles for jquery.tablesorter"

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

Sat, 16 Jun 2018 17:44:06 +0000 (17:44 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 16 Jun 2018 17:44:06 +0000 (17:44 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 16 Jun 2018 17:44:06 +0000 (17:44 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 16 Jun 2018 17:44:06 +0000 (17:44 +0000)
diff --cc includes/skins/Skin.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sat, 16 Jun 2018 17:44:06 +0000 (17:44 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 16 Jun 2018 17:44:06 +0000 (17:44 +0000)
		1	2
includes/skins/Skin.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history