Merge branch '1.4.x' into 1.5.x

2017-04-12 10:28:32 +02:00
parent c97268981a be3b5a9dc2
commit 0affa3af3a
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
+indent_size = 4
+
+[*.xml]
+indent_style = tab
+indent_size = 4