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

panlinlin

2021-01-07 397e0c4a27c231e40cbc48b657cbd9fc88bc7ebb

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