tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.0' into 3.1

This commit is contained in:
Robbie Averill 2018-04-10 15:53:04 +12:00
parent c344575ef9 ae953b9a3c
commit db0d4f0f98
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -15,11 +15,10 @@
"silverstripe/asset-admin": "^1.0" "silverstripe/asset-admin": "^1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "^5.7", "phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.0" "squizlabs/php_codesniffer": "^3.0"
}, },
"extra": { "extra": {
"branch-alias": [],
"expose": [ "expose": [
"client/dist", "client/dist",
"client/images" "client/images"