From cc65688b3da3e16729a1f73dd50fd975bd1ff741 Mon Sep 17 00:00:00 2001
From: hellkat <hellkat@ispconfig3>
Date: Tue, 26 Mar 2013 00:43:51 -0400
Subject: [PATCH]     Merged revisions 3845-3876 and 3879-3918 from stable branch.

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

diff --git a/server/server.php b/server/server.php
index e669c6e..1cdcb85 100644
--- a/server/server.php
+++ b/server/server.php
@@ -196,8 +196,8 @@
 	$app->uses('modules,plugins,file,services');
 	// Load the modules that are im the mods-core folder
 	$app->modules->loadModules('core');
-	// Load the plugins that are in the plugins-core folder
-	$app->plugins->loadPlugins('core');
+	// Load the plugins that are in the f folder
+	//$app->plugins->loadPlugins('core');
 }
 
 

--
Gitblit v1.9.1