From 534e45296e926da566cd609f01d7bad564b982a5 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 05 May 2014 03:47:07 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
server/scripts/update_from_svn.sh | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/server/scripts/update_from_svn.sh b/server/scripts/update_from_svn.sh
index becd7e7..8c8ee2a 100644
--- a/server/scripts/update_from_svn.sh
+++ b/server/scripts/update_from_svn.sh
@@ -1,8 +1,6 @@
#!/bin/bash
-cd /tmp
-svn export svn://svn.ispconfig.org/ispconfig3/trunk/
-cd trunk/install
-php -q update.php
-cd /tmp
-rm -rf /tmp/trunk
\ No newline at end of file
+CUR=`dirname $0`
+bash ${CUR}/update_from_dev.sh
+
+exit 0
\ No newline at end of file
--
Gitblit v1.9.1