summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-08 11:14:41 +0100
committerGitHub <noreply@github.com>2018-11-08 11:14:41 +0100
commit78fd8ab0fd362fd5d568dfc5b47a02158e62d51c (patch)
tree37b94351b8a73684b503e4df643e9d5d311e7be9
parent0fb74aff5a6fa9c9be3ede5f1633e7b5abe36c1b (diff)
parent58345e02d20881db8d612002fe65a794696f12cc (diff)
downloadnextcloud-server-78fd8ab0fd362fd5d568dfc5b47a02158e62d51c.tar.gz
nextcloud-server-78fd8ab0fd362fd5d568dfc5b47a02158e62d51c.zip
Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated
Basic CSP no longer deprecated
-rw-r--r--lib/public/AppFramework/Http/ContentSecurityPolicy.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
index 597069fdaaf..e9ecf000364 100644
--- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php
+++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
@@ -39,7 +39,6 @@ namespace OCP\AppFramework\Http;
*
* @package OCP\AppFramework\Http
* @since 8.1.0
- * @deprecated 14.0.0 Use one of our stricter CSP policies
*/
class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
/** @var bool Whether inline JS snippets are allowed */