Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-03-26 14:58:48 +01:00
commit 7bfb7caed8

View File

@ -28,7 +28,7 @@ before_script:
pear install phpunit/PHPUnit_Selenium ;
fi ;
composer install --dev --no-interaction ;
if [[ ! -z "$SELENIUM" ]] then
if [[ ! -z "$SELENIUM" ]] ; then
php --server 127.0.0.1:$TRAVIS_BUILD_NUMBER &
wget https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip ;
unzip BrowserStackLocal-linux-x64.zip ;