Merge branch '1.5.x'

8 years ago · 7f270356ed
parent 2f2b1a0e8f 0affa3af3a
commit 7f270356ed
1 changed files with 8 additions and 2 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,3 +1,9 @@
-[*]
+root=true
+
+[*.java]
+indent_style = tab
+indent_size = 4
+
+[*.xml]
 indent_style = tab
 indent_size = 4