Merge "Breaking out disallowed CSS into a global variable"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)
commita0864e85a202539a6bf3cc58336a1942edd4c6d0
tree3b32e270020ffc511811c6b8b9fd7181350d871f
parentbfa5d12e11af9a8fc30f04e541c28d11e62c3a18
parentad4f512c7452d91c7743de1dbbfad470a1226b9f
Merge "Breaking out disallowed CSS into a global variable"
includes/DefaultSettings.php
includes/Sanitizer.php