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

Merge branch '2.0' into 2

Browse Source
This commit is contained in:
Damian Mooyman 2017-11-28 13:19:29 +13:00
commit 5413f9182e
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -13,5 +13,8 @@ trim_trailing_whitespace = true
[{*.yml,*.json}]
indent_size = 2
[composer.json]
indent_size = 4
# The indent size used in the package.json file cannot be changed:
# https://github.com/npm/npm/pull/3180#issuecomment-16336516

5
composer.json
View File

@ -18,11 +18,6 @@
"composer/installers": "*",
"silverstripe/framework": "^4@dev"
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"scripts": {
"lint": "phpcs -s src/ tests/"
},