Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-05-26 09:33:37 +02:00
commit d73c3410ef

View File

@ -70,8 +70,8 @@ script:
ant lint ;
fi
after_script:
- if [[ -f build/logs/clover.xml ]] ; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml ; fi
- if [[ -f vendor/bin/coveralls ]] ; then php vendor/bin/coveralls -v ; fi
- if [[ -f build/logs/clover.xml ]] ; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml || true ; fi
- if [[ -f vendor/bin/coveralls ]] ; then php vendor/bin/coveralls -v || true ; fi
matrix:
allow_failures:
- php: 5.5