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

Merge remote-tracking branch 'origin/4.0' into 4

Browse Source
This commit is contained in:
Damian Mooyman 2017-10-12 11:54:38 +13:00
commit 8d36d55205
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 4 additions and 1 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_style = space
[composer.json]
indent_size = 4
# Don't perform any clean-up on thirdparty files
[thirdparty/**]

2
composer.json
View File

@ -52,7 +52,7 @@
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"silverstripe/versioned": "^1.0@dev",
"silverstripe/versioned": "^1@dev",
"silverstripe/behat-extension": "^3",
"silverstripe/serve": "dev-master",
"se/selenium-server-standalone": "2.41.0"