Andreas Fischer a1e31f4389 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

2014-05-27 20:38:20 +02:00

..

check-image-icc-profiles.sh

Merge branch 'ticket/12582' into ticket/12582-ascraeus

2014-05-27 20:38:20 +02:00

phing-sniff.sh

[ticket/12592] Rename mysql environment to mysqli.

2014-05-26 18:49:29 +02:00

phpunit-mariadb-travis.xml

[ticket/12485] Broken tests due to absolute exclude

2014-05-03 04:05:25 +02:00

phpunit-mysql-travis.xml

[ticket/12592] Add PHP 5.4 environment using mysql driver.

2014-05-26 19:07:40 +02:00

phpunit-mysqli-travis.xml

[ticket/12592] Rename mysql environment to mysqli.

2014-05-26 18:49:29 +02:00

phpunit-postgres-travis.xml

Merge branch 'develop-olympus' into develop-ascraeus

2014-05-03 10:28:15 +02:00

phpunit-sqlite3-travis.xml

Merge branch 'develop-olympus' into develop-ascraeus

2014-05-03 10:28:15 +02:00

setup-database.sh

[ticket/12592] Add PHP 5.4 environment using mysql driver.

2014-05-26 19:07:40 +02:00

setup-exiftool.sh

Merge branch 'ticket/12582' into ticket/12582-ascraeus

2014-05-27 20:38:20 +02:00

setup-mariadb.sh

[ticket/11970] Make apt-get less quiet.

2013-10-26 01:39:04 +02:00

setup-php-extensions.sh

[ticket/12281] Disable redis on travis until its fixed again

2014-03-16 16:36:58 +01:00

setup-phpbb.sh

Merge branch 'ticket/12582' into ticket/12582-ascraeus

2014-05-27 20:38:20 +02:00

setup-webserver.sh

[ticket/12592] Make hhvm run MySQL again.

2014-05-26 21:55:44 +02:00