Merge branch 'master' into doc-comment-formatting

JoeRobich · web-flow · commit 4a6ad525cc52 · 2020-12-14T10:06:08.000-08:00
diff --git a/package.json b/package.json
@@ -896,6 +896,10 @@
       {
         "fileMatch": "omnisharp.json",
         "url": "http://json.schemastore.org/omnisharp"
+      },
+      {
+        "fileMatch": "global.json",
+        "url": "http://json.schemastore.org/global"
       }
     ],
     "commands": [
@@ -3652,4 +3656,4 @@
       ]
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -896,6 +896,10 @@`
`896`	`896`	`{`
`897`	`897`	`"fileMatch": "omnisharp.json",`
`898`	`898`	`"url": "http://json.schemastore.org/omnisharp"`
	`899`	`+ },`
	`900`	`+ {`
	`901`	`+ "fileMatch": "global.json",`
	`902`	`+ "url": "http://json.schemastore.org/global"`
`899`	`903`	`}`
`900`	`904`	`],`
`901`	`905`	`"commands": [`
`@@ -3652,4 +3656,4 @@`
`3652`	`3656`	`]`
`3653`	`3657`	`}`
`3654`	`3658`	`}`
`3655`		`-}`
	`3659`	`+}`