From 069b2fea73b3613776af8ced5f20fc1bac269121 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 22 Mar 2016 13:05:43 -0400
Subject: [PATCH] Merge branch 'mail_filter_fix' into 'master'

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

diff --git a/interface/web/help/lib/admin.conf.php b/interface/web/help/lib/admin.conf.php
index b0163e5..62616b1 100644
--- a/interface/web/help/lib/admin.conf.php
+++ b/interface/web/help/lib/admin.conf.php
@@ -5,4 +5,4 @@
 */
 
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1