From 1a2cbfbf0cd666af05c28c3a7e51de3fb59bdd99 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 20 Nov 2013 03:34:56 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 server/server.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/server.php b/server/server.php
index 60251e3..ab25404 100644
--- a/server/server.php
+++ b/server/server.php
@@ -172,9 +172,9 @@
 	$app->modules->loadModules('all');
 	//** Load the plugins that are in the plugins-enabled folder
 	$app->plugins->loadPlugins('all');
-
+	
 	$app->plugins->raiseAction('server_plugins_loaded', '');
-
+	
 	if ($tmp_num_records > 0) {
 		$app->log("Found $tmp_num_records changes, starting update process.", LOGLEVEL_DEBUG);
 		//** Go through the sys_datalog table and call the processing functions

--
Gitblit v1.9.1