Merge branch '1.4.x' into 1.5.x

0affa3af · Stephane Nicoll · c9726898 · be3b5a9d · 0affa3af
Commit 0affa3af authored Apr 12, 2017 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

.editorconfig .editorconfig +8 -2

No files found.
--- a/.editorconfig
+++ b/.editorconfig
-[*]
+root=true
+
+[*.java]
 indent_style = tab
-indent_size = 4
\ No newline at end of file
+indent_size = 4
+
+[*.xml]
+indent_style = tab
+indent_size = 4