Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-web into dev

zhanghua

6 小时以前 4049531e168e3abd88c1c7809c4350424622cd8e

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