From dbf57dddf7ef07a0168ad0c1d64de0735a9c5804 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 31 Mar 2016 02:09:24 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
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