Merge remote-tracking branch 'upstream/master' into master

Lawrence

2020-10-25 9a84ef06adff44bc6e24caa8bc16731eff061f3c

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