tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.1' into 4

Browse Source
This commit is contained in:
Damian Mooyman 2018-02-07 16:44:41 +13:00
commit 30df0f5e43
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -19,7 +19,7 @@ addons:
env: env:
global: global:
- TRAVIS_NODE_VERSION="6" - TRAVIS_NODE_VERSION="6"
- COMPOSER_ROOT_VERSION="4.x-dev" - COMPOSER_ROOT_VERSION="4.2.x-dev"
- DISPLAY=":99" - DISPLAY=":99"
- XVFBARGS=":99 -ac -screen 0 1024x768x16" - XVFBARGS=":99 -ac -screen 0 1024x768x16"

2
composer.json
View File

@ -5,7 +5,7 @@
"require": { "require": {
"php": ">=5.6.0", "php": ">=5.6.0",
"silverstripe/recipe-plugin": "^1", "silverstripe/recipe-plugin": "^1",
"silverstripe/recipe-cms": "1.1.x-dev", "silverstripe/recipe-cms": "1.2.x-dev",
"silverstripe-themes/simple": "~3.2.0" "silverstripe-themes/simple": "~3.2.0"
}, },
"require-dev": { "require-dev": {