Merge 1 into master

This commit is contained in:
Damian Mooyman 2017-10-12 10:35:29 +13:00
commit c98bdd1ced
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A

View File

@ -5,7 +5,7 @@
"homepage": "http://silverstripe.org",
"license": "BSD-3-Clause",
"require": {
"silverstripe/recipe-plugin": "^0.1",
"silverstripe/recipe-plugin": ">=0.1@dev <1.0",
"silverstripe/recipe-core": "2.x-dev",
"silverstripe/admin": "2.x-dev",
"silverstripe/asset-admin": "2.x-dev",