Merge "Change 'editfont' default preference to 'monospace'"

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

Mon, 21 Aug 2017 16:42:23 +0000 (16:42 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 21 Aug 2017 16:42:23 +0000 (16:42 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 21 Aug 2017 16:42:23 +0000 (16:42 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 21 Aug 2017 16:42:23 +0000 (16:42 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/Preferences.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 21 Aug 2017 16:42:23 +0000 (16:42 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 21 Aug 2017 16:42:23 +0000 (16:42 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Preferences.php	patch \|	diff1 \|	diff2 \|	blob \| history