Merge branch 'master' into sandy081/httpEndPointSync

This commit is contained in:
Sandeep Somavarapu
2019-09-18 19:03:24 +02:00
182 changed files with 2804 additions and 2205 deletions

View File

@@ -81,6 +81,7 @@ import 'vs/workbench/services/notification/common/notificationService';
import 'vs/workbench/services/extensions/common/staticExtensions';
import 'vs/workbench/services/userDataSync/common/settingsMergeService';
import 'vs/workbench/services/workspace/browser/workspaceEditingService';
import 'vs/workbench/services/host/browser/browserHostService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';