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

Merge branch '3.1'

This commit is contained in:
Robbie Averill 2018-04-06 10:29:45 +12:00
parent 392b4aafd9 4c1303bfb5
commit d520d9dd94
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@ -11,16 +11,16 @@
"silverstripe/cms": "^4.0", "silverstripe/cms": "^4.0",
"silverstripe/lumberjack": "^2.0", "silverstripe/lumberjack": "^2.0",
"silverstripe/tagfield": "^2.0", "silverstripe/tagfield": "^2.0",
"silverstripe/assets": "^1.0@dev", "silverstripe/assets": "^1.0",
"silverstripe/asset-admin": "^1.0@dev" "silverstripe/asset-admin": "^1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "^5.7", "phpunit/PHPUnit": "^5.7",
"squizlabs/php_codesniffer": "*" "squizlabs/php_codesniffer": "^3.0"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.0.x-dev" "dev-master": "3.2.x-dev"
}, },
"expose": [ "expose": [
"client/dist", "client/dist",