From b4263138f9632d3a9c098a9e6ad1fdccee03fcc9 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Fri, 22 Jan 2016 13:18:41 -0500
Subject: [PATCH] Merge branch 'dns-dnssec' of git.ispconfig.org:darkalex/ispconfig3 into dns-dnssec

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