From 522bede75fce4a0e3a7d2c7eff1eee198b900a22 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 17 Jun 2016 04:18:25 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

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

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

--
Gitblit v1.9.1