Merge remote-tracking branch 'origin/master'

doum

5 天以前 b6f401dd0a9d9bfb6c11c07cdcaab967eabb8af1

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