Merge branch 'master' into test

935090232@qq.com

2020-12-05 0a5277a24bce41ca6900d4176cbe30cde55d2be6

1
2
3
4
5
{
    "editor.fontSize": 14,
    "files.autoSave": "afterDelay",
    "editor.cursorStyle": "line-thin"
}