From dbf29d9979fe779e8801685c0132dbee681e15cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 01 Jul 2014 12:39:22 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-master

---
 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