From 7b26eae1b657e81aefe2a50e1c15518f0f6ee935 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 27 Aug 2015 02:45:37 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/vm/form/openvz_vm.tform.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/interface/web/vm/form/openvz_vm.tform.php b/interface/web/vm/form/openvz_vm.tform.php
index 666d06c..d6911cc 100644
--- a/interface/web/vm/form/openvz_vm.tform.php
+++ b/interface/web/vm/form/openvz_vm.tform.php
@@ -327,6 +327,12 @@
 			//#################################
 		)
 	);
+
+	$form["tabs"]['additional_ip'] = array (
+		'title'  => "Additional IP",
+		'width'  => 100,
+		'template'  => "templates/openvz_vm_additional_ip_edit.htm",
+	);
 }
 
 

--
Gitblit v1.9.1