Merge "Use classes to apply the 'editfont' preference"

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

Wed, 28 Sep 2016 20:03:38 +0000 (20:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 28 Sep 2016 20:03:38 +0000 (20:03 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 28 Sep 2016 20:03:38 +0000 (20:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 28 Sep 2016 20:03:38 +0000 (20:03 +0000)
diff --cc includes/EditPage.php
Simple merge
diff --cc resources/src/mediawiki.legacy/shared.css
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 28 Sep 2016 20:03:38 +0000 (20:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 28 Sep 2016 20:03:38 +0000 (20:03 +0000)
		1	2
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/mediawiki.legacy/shared.css	patch \|	diff1 \|	diff2 \|	blob \| history