Merge branch '2.2'

silverstripe · Aug 5, 2018 · c91315f · c91315f
2 parents bf1ccfb + 036eebb
commit c91315f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
 
   # Install composer dependencies
   - composer validate
-  - composer require --no-update silverstripe/recipe-core 1.2.x-dev
+  - composer require --no-update silverstripe/recipe-core 4.3.x-dev
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:

diff --git a/composer.json b/composer.json
@@ -8,8 +8,8 @@
         "cwp"
     ],
     "require": {
-        "silverstripe/framework": "^4.2",
-        "silverstripe/admin": "^1.2",
+        "silverstripe/framework": "^4.3",
+        "silverstripe/admin": "^1.3",
         "silverstripe/hybridsessions": "^2",
         "silverstripe/environmentcheck": "^2",
         "silverstripe/auditor": "^2"