Merge branch 'patch-2' into 'develop'

* fix nginx 1.15 warning:

See merge request pleroma/pleroma!213
This commit is contained in:
lambda 2018-06-14 07:23:14 +00:00
commit 678df59d22

View File

@ -29,7 +29,6 @@ ssl_session_cache shared:ssl_session_cache:10m;
server { server {
listen 443 ssl http2; listen 443 ssl http2;
ssl on;
ssl_session_timeout 5m; ssl_session_timeout 5m;
ssl_trusted_certificate /etc/letsencrypt/live/example.tld/fullchain.pem; ssl_trusted_certificate /etc/letsencrypt/live/example.tld/fullchain.pem;