Merge branch 'master' into extensions-api

# Conflicts:
#	package.json
#	src/common/cluster-store.ts
#	src/renderer/bootstrap.tsx
#	src/renderer/components/cluster-manager/clusters-menu.tsx
#	static/RELEASE_NOTES.md
#	webpack.dll.ts
This commit is contained in:
Roman committed 2020-09-11 12:29:38 +03:00
commit a3dc928430
34 files changed
+273 -139

No files matched your search

+3 -2
View File
@@ -2,7 +2,7 @@
"name": "kontena-lens",
"productName": "Lens",
"description": "Lens - The Kubernetes IDE",
"version": "3.6.0-rc.1",
"version": "3.6.0-rc.2",
"main": "static/build/main.js",
"copyright": "© 2020, Mirantis, Inc.",
"license": "MIT",
@@ -196,7 +196,6 @@
"jsonpath": "^1.0.2",
"lodash": "^4.17.15",
"mac-ca": "^1.0.4",
"make-synchronous": "^0.1.1",
"marked": "^1.1.0",
"md5-file": "^5.0.0",
"mobx": "^5.15.5",
@@ -250,6 +249,7 @@
"@types/material-ui": "^0.21.7",
"@types/md5-file": "^4.0.2",
"@types/mini-css-extract-plugin": "^0.9.1",
"@types/progress-bar-webpack-plugin": "^2.1.0",
"@types/react": "^16.9.35",
"@types/react-router-dom": "^5.1.5",
"@types/react-select": "^3.0.13",
@@ -305,6 +305,7 @@
"nodemon": "^2.0.4",
"patch-package": "^6.2.2",
"postinstall-postinstall": "^2.1.0",
"progress-bar-webpack-plugin": "^2.1.0",
"raw-loader": "^4.0.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",