From cab3bca1d75be6c7f3140a35396d8c6ee2011801 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Wed, 20 Jan 2016 15:16:22 -0500
Subject: [PATCH] Merge branch 'master' into dns-dnssec

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