From 4ae3b94bce6b2f26002c1a50247a01ab4cf2219a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:27:43 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

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

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

--
Gitblit v1.9.1