Merge branch 'master' into ben/test-custom-editor

This commit is contained in:
Benjamin Pasero
2019-11-07 09:45:27 +01:00
73 changed files with 1264 additions and 457 deletions

View File

@@ -253,6 +253,9 @@ import 'vs/workbench/contrib/feedback/browser/feedback.contribution';
// User Data Sync
import 'vs/workbench/contrib/userDataSync/browser/userDataSync.contribution';
// Code Actions
import 'vs/workbench/contrib/codeActions/common/codeActions.contribution';
// Test Custom Editors
import 'vs/workbench/contrib/testCustomEditors/browser/testCustomEditors';