Merge branch 'main' into feature/finalize-bookwork-configs · coder/code-server@376426e

Commit

Merge branch 'main' into feature/finalize-bookwork-configs

Browse files

bdsoha authored Dec 18, 2023

2 parents 22e5f57 + 0b84523 commit 376426e

+2 −2		package.json
+2 −2		src/vs/base/browser/ui/contextview/contextview.ts
+18 −0		src/vs/code/electron-main/app.ts
+6 −0		src/vs/workbench/contrib/files/browser/fileActions.ts
+3 −2		src/vs/workbench/contrib/files/browser/views/explorerView.ts
+30 −31		src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+4 −4		yarn.lock