Merge branch 'refs/heads/2.7.0'

648540858

2024-04-24 b89af9a6936f15044a5d8f568ab691f796cfbec2

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