Merge branch 'master' into toml/install-scripts-fail-fast

2019-04-03 15:52:11 +02:00
parent 9c41ccce58 240c715c84
commit c1464aaa5d
12 changed files with 54 additions and 66 deletions
--- a/riot/install.sh
+++ b/riot/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
+RIOT_BRANCH=develop

-RIOT_BRANCH=master
 BASE_DIR=$(cd $(dirname $0) && pwd)
 if [ -d $BASE_DIR/riot-web ]; then
    echo "riot is already installed"