tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Update composer

Browse Source
This commit is contained in:
Damian Mooyman 2017-10-12 11:30:11 +13:00
parent 42cd0903df
commit acadcadbdf
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -17,6 +17,9 @@ trim_trailing_whitespace = false
indent_size = 2 indent_size = 2
indent_style = space indent_style = space
[composer.json]
indent_size = 4
# Don't perform any clean-up on thirdparty files # Don't perform any clean-up on thirdparty files
[thirdparty/**] [thirdparty/**]
trim_trailing_whitespace = false trim_trailing_whitespace = false

4
composer.json
View File

@ -31,7 +31,7 @@
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7", "phpunit/phpunit": "^5.7",
"silverstripe/behat-extension": "^3@dev", "silverstripe/behat-extension": "^3@dev",
"silverstripe/serve": "dev-master", "silverstripe/serve": "^2",
"se/selenium-server-standalone": "2.41.0" "se/selenium-server-standalone": "2.41.0"
}, },
"extra": { "extra": {
@ -53,4 +53,4 @@
}, },
"prefer-stable": true, "prefer-stable": true,
"minimum-stability": "dev" "minimum-stability": "dev"
} }