From 5b3c29178704c047d4020df2ae445ff01c6e1f3a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 22 Jun 2015 08:48:27 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 install/tpl/system.ini.master |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 92ae518..eb709c8 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -40,6 +40,7 @@
 new_domain_html=Please contact our support to create a new domain for you.
 
 [misc]
+company_name=
 dashboard_atom_url_admin=http://www.ispconfig.org/atom
 dashboard_atom_url_reseller=http://www.ispconfig.org/atom
 dashboard_atom_url_client=http://www.ispconfig.org/atom

--
Gitblit v1.9.1