From dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 19 May 2016 05:01:32 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

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

diff --git a/interface/web/mailuser/lib/remote.conf.php b/interface/web/mailuser/lib/remote.conf.php
index 15c5adc..62a2de0 100644
--- a/interface/web/mailuser/lib/remote.conf.php
+++ b/interface/web/mailuser/lib/remote.conf.php
@@ -1,3 +1,3 @@
 <?php
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1