Merge branch 'master' of github.com:spotify/backstage into ndudnik/use-catalog-backend

# Conflicts: # plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx # plugins/catalog/src/components/CatalogPage/CatalogPage.tsx # plugins/catalog/src/components/ComponentPage/ComponentPage.tsx # plugins/catalog/src/data/mock-factory.ts # plugins/catalog/src/plugin.ts
2020-05-28 14:28:00 +02:00
parent 3fa037ad18 f182ae3e41
commit fa02aa113e
200 changed files with 2982 additions and 644 deletions
@@ -18,7 +18,6 @@
    "@backstage/plugin-sentry": "^0.1.1-alpha.6",
    "@material-ui/core": "^4.9.1",
    "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "4.0.0-alpha.45",
    "prop-types": "^15.7.2",
    "react": "^16.12.0",
    "react-dom": "^16.12.0",