Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-08-19 14:54:16 +02:00
commit c825ef39ed

View File

@ -1,6 +1,6 @@
#!/bin/bash
if [ $TRAVIS_PHP_VERSION = "nightly" -o $TRAVIS_PHP_VERSION = "5.3" -o $TRAVIS_PHP_VERSION = "7.0" ] ; then
if [ $TRAVIS_PHP_VERSION = "nightly" -o $TRAVIS_PHP_VERSION = "7.0" ] ; then
exit 0
fi