Merge "Remove 'Browser default' editfont option"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 3 Oct 2017 18:46:52 +0000 (18:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Oct 2017 18:46:52 +0000 (18:46 +0000)
1  2 
includes/EditPage.php
includes/Preferences.php
languages/i18n/en.json
languages/i18n/qqq.json
resources/src/mediawiki.legacy/shared.css

Simple merge
Simple merge
Simple merge
Simple merge