Merge "Initial support for Content Security Policy, disabled by default"

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

Mon, 14 May 2018 04:17:15 +0000 (04:17 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 14 May 2018 04:17:15 +0000 (04:17 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 14 May 2018 04:17:15 +0000 (04:17 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 14 May 2018 04:17:15 +0000 (04:17 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 14 May 2018 04:17:15 +0000 (04:17 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 14 May 2018 04:17:15 +0000 (04:17 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history