Merge remote-tracking branch 'origin/master' into mobx-6.2

# Conflicts:
#	extensions/survey/package-lock.json
#	extensions/survey/package.json
#	extensions/survey/src/survey-preferences-store.ts
#	extensions/telemetry/src/telemetry-preferences-store.ts
#	src/common/user-store.ts
#	src/extensions/core-api/catalog.ts
#	src/extensions/extension-discovery.ts
#	src/extensions/lens-extension.ts
#	src/main/cluster-manager.ts
#	src/renderer/bootstrap.tsx
#	src/renderer/components/+apps-helm-charts/helm-chart.store.ts
#	src/renderer/components/+apps-releases/release.store.ts
#	src/renderer/components/+catalog/catalog.tsx
#	src/renderer/components/+extensions/extension-install.store.ts
#	src/renderer/components/+extensions/extensions.tsx
#	src/renderer/components/+preferences/preferences.tsx
#	src/renderer/components/dock/create-resource.store.ts
#	src/renderer/components/kube-object/kube-object-list-layout.tsx
#	src/renderer/theme.store.ts
#	src/renderer/utils/storageHelper.ts
This commit is contained in:
Roman committed 2021-04-21 17:28:18 +03:00
commit a0193a2cda
263 files changed
+3401 -31747

No files matched your search

+3 -3
View File
@@ -6337,9 +6337,9 @@
}
},
"ssri": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
"integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
"dev": true,
"requires": {
"figgy-pudding": "^3.5.1"