diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-08 15:28:45 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-08 15:28:45 -0500 |
| commit | d7beac6d6f3ad588cee6c5ba8a2145b42fa184a2 (patch) | |
| tree | 613f576938ee8ef88a5a93304a824f60fbb85a7a /config | |
| parent | 2ed850e05b46d820528813c2f2415dad60c1c570 (diff) | |
| parent | 546fb72b25fb8ebdc70aa75ccc7a095d7d83b174 (diff) | |
| download | nextcloud-server-d7beac6d6f3ad588cee6c5ba8a2145b42fa184a2.tar.gz nextcloud-server-d7beac6d6f3ad588cee6c5ba8a2145b42fa184a2.zip | |
Merge branch 'master' into filecache_mtime
Conflicts:
lib/files/view.php
lib/util.php
tests/lib/files/cache/cache.php
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 2f394c41a3b..ec61ceefd6c 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -136,7 +136,7 @@ $CONFIG = array( "remember_login_cookie_lifetime" => 60*60*24*15, /* Custom CSP policy, changing this will overwrite the standard policy */ -"custom_csp_policy" => "default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *; font-src \'self\' data:", +"custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:", /* The directory where the user data is stored, default to data in the owncloud * directory. The sqlite database is also stored here, when sqlite is used. |