Commit dfead885 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.1.x'

parents 50425bd4 1e2177d4
root=true root=true
[*.java] [*.{groovy,java,kt,xml}]
indent_style = tab
indent_size = 4
continuation_indent_size = 8
[*.xml]
indent_style = tab indent_style = tab
indent_size = 4 indent_size = 4
continuation_indent_size = 8 continuation_indent_size = 8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment