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

panlinlin

2021-01-05 34135cce5d59f6ad7653737dd035bb1d441e185f

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