Merge remote branch 'origin/master' into edge

automatic-merge · automatic-merge · commit ba5805c42c95 · 2023-12-01T00:56:22.000Z
diff --git a/integration/vscode/ada/package.json b/integration/vscode/ada/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ada",
-    "displayName": "Ada",
+    "displayName": "Ada & SPARK",
     "description": "Ada & SPARK IntelliSense, code browsing, debugging and more.",
     "version": "24.0.999",
     "publisher": "AdaCore",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ada",`
`3`		`- "displayName": "Ada",`
	`3`	`+ "displayName": "Ada & SPARK",`
`4`	`4`	`"description": "Ada & SPARK IntelliSense, code browsing, debugging and more.",`
`5`	`5`	`"version": "24.0.999",`
`6`	`6`	`"publisher": "AdaCore",`