Merge remote-tracking branch 'origin/3.1' into 3

This commit is contained in:
Damian Mooyman 2015-06-17 10:14:01 +12:00
commit cc2f3ae603

View File

@ -37,7 +37,7 @@ matrix:
- sudo apt-get install -y tidy
before_script:
- composer self-update
- composer self-update || true
- phpenv rehash
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"