Merge branch 'main' into main-dev

648540858

2023-04-03 786c76ba714321c2d481b32afbb619a33f7c11a9

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