diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-28 19:56:20 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-28 19:56:20 +0300 |
commit | 908cf22a6cb07044eb0fb44c9673c8adcf22c0db (patch) | |
tree | b522172092989cb1d1312f846974ff55493fbee9 /docs/configuration | |
parent | b4139cc5472079a34f0256ac9991a0222844d44c (diff) | |
parent | 699fc9569fa06278baaec6804348375cb9891185 (diff) | |
download | pleroma-908cf22a6cb07044eb0fb44c9673c8adcf22c0db.tar.gz pleroma-908cf22a6cb07044eb0fb44c9673c8adcf22c0db.zip |
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Diffstat (limited to 'docs/configuration')
-rw-r--r-- | docs/configuration/hardening.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/configuration/hardening.md b/docs/configuration/hardening.md index b54c28850..d3bfc4e4a 100644 --- a/docs/configuration/hardening.md +++ b/docs/configuration/hardening.md @@ -36,7 +36,7 @@ content-security-policy: default-src 'none'; base-uri 'self'; frame-ancestors 'none'; - img-src 'self' data: https:; + img-src 'self' data: blob: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; |