Merge branch 'stable-3.1' into 'stable-3.1'

remove linebreak in vhost.conf.master for SSLCipherSuite

See merge request ispconfig/ispconfig3!779

Author: Till Brehm

server/conf/vhost.conf.master

@@ -41,8 +41,7 @@
 <tmpl_if name='enable_http2' op='==' value='y'>
 		Protocols h2 http/1.1
 		SSLProtocol All -SSLv2 -SSLv3
-		SSLCipherSuite 'EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA !RC4 !aNULL !eNULL !LOW !3DES !M
-D5 !EXP !PSK !SRP !DSS'
+		SSLCipherSuite 'EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA !RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS'
 </tmpl_if>
 </tmpl_if>