From 11ca0c5316e1c84ace4eb8e40c8d2868f508f13a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 11 Mar 2014 09:26:52 -0400
Subject: [PATCH]  Merge branch 'opensuse-srv-www' into 'master'

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

diff --git a/interface/web/mail/lib/admin.conf.php b/interface/web/mail/lib/admin.conf.php
index 67c94a5..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
+?>

--
Gitblit v1.9.1