Merge remote-tracking branch 'origin/develop' into develop

jenkins.sh

@@ -12,6 +12,7 @@ set -x
 npm install
 
 scripts/fetchdep.sh matrix-org matrix-js-sdk
+rm -r node_modules/matrix-js-sdk || true
 ln -s ../matrix-js-sdk node_modules/matrix-js-sdk
 (cd matrix-js-sdk && npm install)
 

scripts/fetchdep.sh

@@ -5,6 +5,8 @@ set -e
 org="$1"
 repo="$2"
 
+rm -r "$repo" || true
+
 curbranch="$TRAVIS_PULL_REQUEST_BRANCH"
 [ -z "$curbranch" ] && curbranch="$TRAVIS_BRANCH"
 [ -z "$curbranch" ] && curbranch=`"echo $GIT_BRANCH" | sed -e 's/^origin\///'` # jenkins