From f6e42fc631acad20006ad79f63ccecc0a86ad0eb Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 07 May 2015 11:26:41 -0400 Subject: [PATCH] Merge branch 'master' into 'master' --- interface/web/admin/form/server_config.tform.php | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 0f78f9d..a03636a 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -616,14 +616,12 @@ 'width' => '40', 'maxlength' => '255' ), - /* -'vhost_rewrite_v6' => array ( -'datatype' => 'VARCHAR', -'formtype' => 'CHECKBOX', -'default' => 'n', -'value' => array(0 => 'n',1 => 'y') -), -*/ + 'vhost_rewrite_v6' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') + ), 'vhost_conf_dir' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', -- Gitblit v1.9.1