Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-13 ccc188c1135653685868199d3fecaf15b55938fd

1
2
3
4
5
6
7
8
9
root = true
 
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true