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'

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

diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index eb709c8..81b3337 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -41,6 +41,8 @@
 
 [misc]
 company_name=
+custom_login_text=
+custom_login_link=
 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