diff options
| author | Mattijs van Druenen <mattijsvandruenen@voormedia.com> | 2018-11-07 10:21:39 +0100 |
|---|---|---|
| committer | Mattijs van Druenen <mattijsvandruenen@voormedia.com> | 2018-11-07 10:21:39 +0100 |
| commit | 1a927acb5f438e50dec4ae5afc91dda22d3f7be1 (patch) | |
| tree | e18085f266db86d064a6630dec648227d65211ca | |
| parent | ce0b3fe4b7490604604294992f41d8ccd91f6cf6 (diff) | |
| parent | 7551e288836f125d0b80ec99c620add4f58e4991 (diff) | |
| download | tinify-php-1a927acb5f438e50dec4ae5afc91dda22d3f7be1.zip tinify-php-1a927acb5f438e50dec4ae5afc91dda22d3f7be1.tar.gz tinify-php-1a927acb5f438e50dec4ae5afc91dda22d3f7be1.tar.bz2 | |
Merge branch 'master' into create-key
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | LICENSE | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index bcb7dc5..1f68879 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ language: php php: -- 5.3 - 5.4 - 5.5 - 5.6 - 7.0 - 7.1 +- 7.2 - nightly env: global: @@ -14,10 +14,12 @@ matrix: allow_failures: - php: nightly include: - - php: hhvm - dist: trusty - include: - - php: 5.6 + - dist: precise + php: 5.3 + - dist: trusty + php: hhvm + - dist: trusty + php: 5.6 env: INTEGRATION_TESTS=true script: "if [ \"$TRAVIS_PULL_REQUEST\" == \"false\" ]; then vendor/bin/phpunit --no-configuration test/integration.php; fi" before_script: composer install @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2013-2016 Voormedia +Copyright (c) 2013-2018 Tinify Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal |