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

Merge branch '3'

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

3
.editorconfig
View File

@ -14,6 +14,9 @@ trim_trailing_whitespace = true
indent_size = 2
indent_style = space
[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

2
composer.json
View File

@ -44,7 +44,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
"3.x-dev": "3.1.x-dev"
}
},
"scripts": {