Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

cgmanifest.json

@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "bc8fc0d406d32e4c02f3ec9f161deaacbe4f5989"
+					"commitHash": "5f93e889020d279d5a9cd1ecab080ab467312447"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "7.3.1"
+			"version": "7.3.2"
 		},
 		{
 			"component": {
@@ -77,6 +77,40 @@
 				}
 			},
 			"isOnlyProductionDependency": true,
+			"licenseDetail": [
+				"Inno Setup License",
+				"==================",
+				"",
+				"Except where otherwise noted, all of the documentation and software included in the Inno Setup",
+				"package is copyrighted by Jordan Russell.",
+				"",
+				"Copyright (C) 1997-2020 Jordan Russell. All rights reserved.",
+				"Portions Copyright (C) 2000-2020 Martijn Laan. All rights reserved.",
+				"",
+				"This software is provided \"as-is,\" without any express or implied warranty. In no event shall the",
+				"author be held liable for any damages arising from the use of this software.",
+				"",
+				"Permission is granted to anyone to use this software for any purpose, including commercial",
+				"applications, and to alter and redistribute it, provided that the following conditions are met:",
+				"",
+				"1. All redistributions of source code files must retain all copyright notices that are currently in",
+				"   place, and this list of conditions without modification.",
+				"",
+				"2. All redistributions in binary form must retain all occurrences of the above copyright notice and",
+				"   web site addresses that are currently in place (for example, in the About boxes).",
+				"",
+				"3. The origin of this software must not be misrepresented; you must not claim that you wrote the",
+				"   original software. If you use this software to distribute a product, an acknowledgment in the",
+				"   product documentation would be appreciated but is not required.",
+				"",
+				"4. Modified versions in source or binary form must be plainly marked as such, and must not be",
+				"   misrepresented as being the original software.",
+				"",
+				"",
+				"Jordan Russell",
+				"jr-2010 AT jrsoftware.org",
+				"https://jrsoftware.org/"
+			],
 			"version": "5.5.6"
 		},
 		{