mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge branch 'ticket/12917' into ticket/12917-asc
* ticket/12917: [ticket/12917] Check commit message and image ICC profile on 5.3.3 Conflicts: .travis.yml
This commit is contained in:
@@ -14,7 +14,7 @@ set -x
|
||||
DB=$1
|
||||
TRAVIS_PHP_VERSION=$2
|
||||
|
||||
if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
|
||||
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
|
||||
then
|
||||
travis/setup-exiftool.sh
|
||||
fi
|
||||
|
Reference in New Issue
Block a user