Merge branch 'main' into digitarald/ces

This commit is contained in:
Harald Kirschner
2021-03-01 17:44:38 -08:00
1127 changed files with 40236 additions and 40724 deletions

View File

@@ -53,6 +53,7 @@ import 'vs/workbench/browser/parts/views/viewsService';
//#region --- workbench services
import 'vs/platform/workspace/common/workspaceTrust';
import 'vs/platform/undoRedo/common/undoRedoService';
import 'vs/workbench/services/extensions/browser/extensionUrlHandler';
import 'vs/workbench/services/keybinding/common/keybindingEditing';
@@ -231,7 +232,6 @@ import 'vs/workbench/contrib/terminal/common/environmentVariable.contribution';
import 'vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution';
import 'vs/workbench/contrib/terminal/browser/terminal.contribution';
import 'vs/workbench/contrib/terminal/browser/terminalView';
import 'vs/workbench/contrib/terminal/browser/remoteTerminalService';
// Relauncher
import 'vs/workbench/contrib/relauncher/browser/relauncher.contribution';
@@ -310,6 +310,9 @@ import 'vs/workbench/contrib/welcome/common/viewsWelcome.contribution';
// Timeline
import 'vs/workbench/contrib/timeline/browser/timeline.contribution';
// Workspace
import 'vs/workbench/contrib/workspace/browser/workspace.contribution';
// Workspaces
import 'vs/workbench/contrib/workspaces/browser/workspaces.contribution';