Merge pull request #21630 from owncloud/add-some-security-headers-as-hardening

author Thomas Müller <thomas.mueller@tmit.eu>

Wed, 13 Jan 2016 09:33:58 +0000 (10:33 +0100)

committer Thomas Müller <thomas.mueller@tmit.eu>

Wed, 13 Jan 2016 09:33:58 +0000 (10:33 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:33:58 +0000 (10:33 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:33:58 +0000 (10:33 +0100)
diff --cc core/js/setupchecks.js
Simple merge
diff --cc core/js/tests/specs/setupchecksSpec.js
Simple merge
diff --cc lib/private/response.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 13 Jan 2016 09:33:58 +0000 (10:33 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 13 Jan 2016 09:33:58 +0000 (10:33 +0100)
		1	2
core/js/setupchecks.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/js/tests/specs/setupchecksSpec.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/response.php	patch \|	diff1 \|	diff2 \|	blob \| history