Merge "resourceloader: Soft-deprecate use of global LESS variables"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 28 Jul 2017 17:09:49 +0000 (17:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 28 Jul 2017 17:09:49 +0000 (17:09 +0000)
1  2 
includes/DefaultSettings.php

Simple merge