Merge branch '1.1' into 1.2

This commit is contained in:
Daniel Hensby 2017-07-26 14:23:02 +01:00
commit e3bebfe453
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -7,17 +7,17 @@ sudo: false
matrix: matrix:
include: include:
- php: 5.3 - php: 5.3
env: DB=POSTGRESQL CORE_RELEASE=3.4 env: DB=PGSQL CORE_RELEASE=3.4
- php: 5.4 - php: 5.4
env: DB=POSTGRESQL CORE_RELEASE=3.5 env: DB=PGSQL CORE_RELEASE=3.5
- php: 5.5 - php: 5.5
env: DB=POSTGRESQL CORE_RELEASE=3.6 env: DB=PGSQL CORE_RELEASE=3.6
- php: 5.6 - php: 5.6
env: DB=POSTGRESQL CORE_RELEASE=3 env: DB=PGSQL CORE_RELEASE=3
- php: 7.0 - php: 7.0
env: DB=POSTGRESQL CORE_RELEASE=3 env: DB=PGSQL CORE_RELEASE=3
- php: 7.1 - php: 7.1
env: DB=POSTGRESQL CORE_RELEASE=3 env: DB=PGSQL CORE_RELEASE=3
before_script: before_script:
- composer self-update || true - composer self-update || true