From 20e30b45aaaf068b0391ff4679e4f44a0fae8d6e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 24 Jan 2014 06:32:28 -0500
Subject: [PATCH]  Merge branch 'master' into 'master'

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

diff --git a/interface/web/designer/lib/admin.conf.php b/interface/web/designer/lib/admin.conf.php
index dc10d56..6eff33c 100644
--- a/interface/web/designer/lib/admin.conf.php
+++ b/interface/web/designer/lib/admin.conf.php
@@ -1,4 +1,4 @@
 <?php
 
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1