Merge pull request #132 from robbieaverill/bugfix/131-asset-admin-dev-master

FIX use latest dev-master for asset-admin composer contraint
This commit is contained in:
Daniel Hensby 2016-08-31 21:31:30 +01:00 committed by GitHub
commit ca725e6269

View File

@ -8,7 +8,7 @@
"silverstripe/reports": "self.version", "silverstripe/reports": "self.version",
"silverstripe/siteconfig": "self.version", "silverstripe/siteconfig": "self.version",
"silverstripe-themes/simple": "3.1.*", "silverstripe-themes/simple": "3.1.*",
"silverstripe/asset-admin": "^1" "silverstripe/asset-admin": "1.0.x-dev"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "~4.8" "phpunit/PHPUnit": "~4.8"