Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-04-12 10:28:48 +02:00
commit 7f270356ed
1 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
[*] root=true
[*.java]
indent_style = tab indent_style = tab
indent_size = 4 indent_size = 4
[*.xml]
indent_style = tab
indent_size = 4