From e100328a7f3d495dfddf71f7c71f24ac14bfd9a0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 14 Feb 2014 06:04:01 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/scripts/ispconfig_update.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index 9bdf729..1001f4f 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -100,7 +100,7 @@
echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
}
} else {
- passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
+ passthru('/usr/local/ispconfig/server/scripts/update_from_dev.sh');
exit;
}
--
Gitblit v1.9.1