Merge branch '3'

This commit is contained in:
Daniel Hensby 2017-06-28 11:18:15 +01:00
commit 84fb64bf8f
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66

View File

@ -1,13 +1,12 @@
language: php # See https://github.com/silverstripe/silverstripe-travis-support for setup details
sudo: false sudo: false
language: php
env: env:
global: global:
- COMPOSER_ROOT_VERSION=1.0.x-dev - COMPOSER_ROOT_VERSION=1.0.x-dev
env:
global:
- CORE_RELEASE=master - CORE_RELEASE=master
matrix: matrix: