tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Damian Mooyman 2017-10-12 12:58:30 +13:00
parent 4a80bd9166 c5ca89a173
commit 8020e36409
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

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

4
composer.json
View File

@ -32,11 +32,11 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"4.x-dev": "4.0.x-dev", "4.x-dev": "4.1.x-dev",
"dev-master": "5.x-dev" "dev-master": "5.x-dev"
}, },
"expose": [ "expose": [
"javascript" "javascript"
] ]
}, },
"autoload": { "autoload": {