mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582: [ticket/12582] Strip away copyrighted ICC profile [ticket/12582] Change strip_icc_profiles.sh to only take a single file. [ticket/12582] Run strip_icc_profiles.sh on Travis CI. [ticket/12582] Overwrite inplace instead of creating _original files. [ticket/12582] Add script for strippping ICC profiles from images. Conflicts: .travis.yml
This commit is contained in:
@@ -9,6 +9,11 @@ set -x
|
||||
DB=$1
|
||||
TRAVIS_PHP_VERSION=$2
|
||||
|
||||
if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
|
||||
then
|
||||
travis/setup-exiftool.sh
|
||||
fi
|
||||
|
||||
if [ "$DB" == "mariadb" ]
|
||||
then
|
||||
travis/setup-mariadb.sh
|
||||
|
Reference in New Issue
Block a user