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

This commit is contained in:
Weblate 2018-10-31 15:13:05 +00:00
commit 0cb7d89665

View file

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