Merge branch 'master' into kubernetes-common

2021-05-03 13:44:14 +02:00
parent 5550c49028 adb440cf53
commit bacb47621e
199 changed files with 2735 additions and 851 deletions
@@ -32,9 +32,9 @@
  "dependencies": {
    "@backstage/catalog-model": "^0.7.4",
    "@backstage/config": "^0.1.4",
-    "@backstage/core": "^0.7.6",
+    "@backstage/core": "^0.7.7",
+    "@backstage/plugin-catalog-react": "^0.1.3",
    "@backstage/plugin-kubernetes-common": "^0.1.0",
-    "@backstage/plugin-catalog-react": "^0.1.3",    
    "@backstage/theme": "^0.2.6",
    "@kubernetes/client-node": "^0.14.0",
    "@material-ui/core": "^4.11.0",