PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' into experimental

Browse source
This commit is contained in:
Bruno Windels 2018-10-31 16:13:21 +01:00
commit df42ce6689
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis-test-riot.sh
View file

@ -27,7 +27,7 @@ npm run build
npm run test npm run test
popd popd
if [ "$TRAVIS_BRANCH" != "experimental" ] if [ "$TRAVIS_BRANCH" = "develop" ]
then then
# run end to end tests # run end to end tests
git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master