Merge remote-tracking branch 'origin/master'

doum

8 天以前 b7d451c91ec40bee70f23b1e2cf6a8797643faef

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