Merge remote-tracking branch 'origin/0311' into 0311

dcc

2024-05-06 34ef18c62b80167c86345eaf635e871e792d4da2

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