diff options
| author | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
|---|---|---|
| committer | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
| commit | 0deaedeeaef088040fb015f5be3e270e3bae508e (patch) | |
| tree | bbdab87adf45592a6a881f808e667ba5c21312a9 /.editorconfig | |
| parent | f6b3295d28352cbeb46dff04799cf8f4d39087bb (diff) | |
| parent | 17e45b2e9c33c736751e059276fadb480f98e621 (diff) | |
| download | Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.gz Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.zst Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.editorconfig')
| -rw-r--r-- | .editorconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig index 8783e4cb..34bd7994 100644 --- a/.editorconfig +++ b/.editorconfig | |||
| @@ -10,7 +10,7 @@ trim_trailing_whitespace = true | |||
| 10 | indent_style = space | 10 | indent_style = space |
| 11 | indent_size = 4 | 11 | indent_size = 4 |
| 12 | 12 | ||
| 13 | [*.{htaccess,html,js,json,xml}] | 13 | [*.{htaccess,html,scss,js,json,xml,yml}] |
| 14 | indent_size = 2 | 14 | indent_size = 2 |
| 15 | 15 | ||
| 16 | [*.php] | 16 | [*.php] |