From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/admin/list/server_config.list.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/list/server_config.list.php b/interface/web/admin/list/server_config.list.php
index 6fc289d..f0540f4 100644
--- a/interface/web/admin/list/server_config.list.php
+++ b/interface/web/admin/list/server_config.list.php
@@ -25,7 +25,7 @@
 $liste["search_prefix"] 	= "search_";
 
 // Records per page
-$liste["records_per_page"] 	= 15;
+$liste["records_per_page"] 	= "15";
 
 // Script File of the list
 $liste["file"]				= "server_config_list.php";

--
Gitblit v1.9.1