From c6611ee0fc88487541f1aa90528a0b9cdcb6a703 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 02 Jan 2016 09:04:27 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/client/lib/admin.conf.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/client/lib/admin.conf.php b/interface/web/client/lib/admin.conf.php
index 67c94a5..acb6c35 100644
--- a/interface/web/client/lib/admin.conf.php
+++ b/interface/web/client/lib/admin.conf.php
@@ -1,2 +1,2 @@
 <?php
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1