Merge branch 'patch-2' into 'develop'

* fix nginx 1.15 warning:

See merge request pleroma/pleroma!213

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index a0a2d9f51471e59aea1d441f103c6568203d3749..e9eeb1848125304190cb0c61f1679644288011dc 100644 (file)
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -29,7 +29,6 @@ ssl_session_cache shared:ssl_session_cache:10m;
 
 server {
     listen 443 ssl http2;
-    ssl on;
     ssl_session_timeout 5m;
 
     ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/fullchain.pem;