From 993d8282e531d37e868f01c16add9363d92a0bb5 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 06 Jul 2016 10:29:52 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 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