Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

lawrencehj

2021-03-14 03ec48e32c9122e1ab0c69ceb6fc56461c697c80

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