Skip to content

Commit

Permalink
Merge branch '2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
robbieaverill committed Nov 7, 2018
2 parents 962cc0a + 8e50f39 commit cb562a5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions composer.json
Expand Up @@ -7,10 +7,10 @@
"require": {
"silverstripe/recipe-plugin": "^1",
"silverstripe/recipe-cms": "^4.3@dev",
"silverstripe/versioned-admin": "^1@dev",
"dnadesign/silverstripe-elemental": "4.x-dev",
"silverstripe/elemental-fileblock": "2.x-dev",
"silverstripe/elemental-bannerblock": "2.x-dev"
"silverstripe/versioned-admin": "^1.1@dev",
"dnadesign/silverstripe-elemental": "4.0.x-dev",
"silverstripe/elemental-fileblock": "2.0.x-dev",
"silverstripe/elemental-bannerblock": "2.0.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^5.7"
Expand Down

0 comments on commit cb562a5

Please sign in to comment.