Merge branch '0.6' into 1.0

2018-02-20 13:45:44 +00:00 · 2018-02-20 13:45:44 +00:00 · ad0252e57d
parent bdea98a875 7e7ad4686d
commit ad0252e57d
1 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,7 +1,7 @@
 # See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details

-language: php 
-php: 
+language: php
+php:
 - 5.3

 env:
@ -23,5 +23,5 @@ before_script:
 - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
 - cd ~/builds/ss

-script: 
+script:
 - phpunit $MODULE_PATH/tests/