Merge branch 'new-guest-access' into luke/new-guest-access-room-view-store

.travis-test-riot.sh

@@ -9,11 +9,16 @@ set -ev
 RIOT_WEB_DIR=riot-web
 REACT_SDK_DIR=`pwd`
 
-git clone --depth=1 --branch develop https://github.com/vector-im/riot-web.git \
+curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+echo "Determined branch to be $curbranch"
+
+git clone https://github.com/vector-im/riot-web.git \
     "$RIOT_WEB_DIR"
 
 cd "$RIOT_WEB_DIR"
 
+git checkout "$curbranch" || git checkout develop
+
 mkdir node_modules
 npm install