mirror of
https://github.com/silverstripe/silverstripe-blog
synced 2024-10-22 11:05:58 +02:00
Merge branch '3.0' into 3.1
This commit is contained in:
commit
db0d4f0f98
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user