From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/themes/default/templates/tabbed_form.tpl.htm |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/interface/web/themes/default/templates/tabbed_form.tpl.htm b/interface/web/themes/default/templates/tabbed_form.tpl.htm
index 7f95b8d..5a50003 100644
--- a/interface/web/themes/default/templates/tabbed_form.tpl.htm
+++ b/interface/web/themes/default/templates/tabbed_form.tpl.htm
@@ -13,8 +13,6 @@
 		  <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
 		  <div class='alert-content'>
 			<ol><tmpl_var name="error"></ol>
-			<div>TODO: IP address is empty.</div>
-			<div>TODO: Hostname is empty.</div>
 		  </div>
 		</div>
 	</tmpl_if>

--
Gitblit v1.9.1