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

2018-02-07 16:44:41 +13:00 · 2018-02-07 16:44:41 +13:00 · 30df0f5e43
parent 7fb7f885f9 b6730c5c9c
commit 30df0f5e43
2 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -19,7 +19,7 @@ addons:
 env:
  global:
    - TRAVIS_NODE_VERSION="6"
-    - COMPOSER_ROOT_VERSION="4.x-dev"
+    - COMPOSER_ROOT_VERSION="4.2.x-dev"
    - DISPLAY=":99"
    - XVFBARGS=":99 -ac -screen 0 1024x768x16"

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