Merge "Add new core tags"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 30 Nov 2017 18:43:28 +0000 (18:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 30 Nov 2017 18:43:28 +0000 (18:43 +0000)
1  2 
includes/DefaultSettings.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge