Merge branch 'master' into pr/97266

This commit is contained in:
João Moreno
2020-05-12 11:32:21 +02:00
238 changed files with 5576 additions and 3642 deletions

View File

@@ -188,7 +188,7 @@ import 'vs/workbench/contrib/markers/browser/markers.contribution';
import 'vs/workbench/contrib/comments/browser/comments.contribution';
// URL Support
import 'vs/workbench/contrib/url/common/url.contribution';
import 'vs/workbench/contrib/url/browser/url.contribution';
// Webview
import 'vs/workbench/contrib/webview/browser/webview.contribution';