8000 Merge branch '3.4' into 4.3 · symfony/symfony-docs@8438849 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8438849

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.3
* 3.4: Updated the editorconfig configuration
2 parents cc5a4ab + 7dc9e63 commit 8438849

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
root = true
22

3-
[*.{rst,rst.inc}]
3+
[*]
44
indent_style = space
5-
indent_size = 2
5+
indent_size = 4
66
charset = utf-8
77
trim_trailing_whitespace = true
88
insert_final_newline = true

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ python: 2.7
44

55
sudo: false
66
cache:
7-
directories: [$HOME/.cache/pip]
7+
directories: [$HOME/.cache/pip]
88

99
install: pip install -r _build/.requirements.txt
1010

1111
script: make -C _build SPHINXOPTS=-nW html
1212

1313
branches:
14-
except:
15-
- github-comments
14+
except:
15+
- github-comments

0 commit comments

Comments
 (0)
0