From 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 14 Jun 2016 04:18:29 -0400
Subject: [PATCH] Merge branch 'florian030/ispconfig3-master' into stable-3.1

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