From f964bf7e7403578e787ce5519d9e63c074967242 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 23 Mar 2016 03:12:16 -0400
Subject: [PATCH] Merge branch '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