Merge "Revert "Breaking out disallowed CSS into a global variable""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Jul 2014 02:50:16 +0000 (02:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Jul 2014 02:50:16 +0000 (02:50 +0000)
commit12b4d386028f4aad69bad040d2ffcd8c0d7e0346
treec9671ffc408d67f62bfa26e4edbfe8ac910de8cb
parenta0864e85a202539a6bf3cc58336a1942edd4c6d0
parentd2c5a1c6e706492444fa1049729688b25626693b
Merge "Revert "Breaking out disallowed CSS into a global variable""
includes/DefaultSettings.php
includes/Sanitizer.php