Merge "Breaking out disallowed CSS into a global variable"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/Sanitizer.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 18 Jul 2014 00:13:11 +0000 (00:13 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Sanitizer.php	patch \|	diff1 \|	diff2 \|	blob \| history