Merge branch 'master' into 2.7.0

648540858

2024-03-28 53d4d10e1c5b346f01501b3ba5f10beccb2f3864

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