Merge remote-tracking branch 'upstream/master'

Lawrence

2020-12-16 b2fa4608a2e0abb3d744f4f91bd423380e45f9c4

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