Merge remote-tracking branch 'origin/master' into 0.10.0

2018-10-20 14:06:19 +02:00
parent 95b305b865 c1809fc084
commit 3b31cd8432
4 changed files with 9 additions and 8 deletions
--- a/actions/admin/settings/131.ssl.php
+++ b/actions/admin/settings/131.ssl.php
@@ -40,7 +40,8 @@ return array(
 					'option_options' => array(
 						'TLSv1' => 'TLSv1',
 						'TLSv1.1' => 'TLSv1.1',
-						'TLSv1.2' => 'TLSv1.2'
+						'TLSv1.2' => 'TLSv1.2',
+						'TLSv1.3' => 'TLSv1.3'
 					),
 					'save_method' => 'storeSettingField'
 				),