Merge "Allow adding of context-based LESS Variables"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 10 Feb 2015 21:34:03 +0000 (21:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 10 Feb 2015 21:34:03 +0000 (21:34 +0000)
1  2 
includes/DefaultSettings.php

Simple merge