Merge branch 'master' into develop

mariocoski · web-flow · commit 3c57df826976 · 2019-10-13T21:46:24.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,9 +6,9 @@
     "@js-items/ky": "1.0.12",
     "@kube-js/semantic-release": "1.0.7",
     "@kube-js/tscommons": "1.0.5",
-    "@material-ui/core": "4.5.0",
-    "@material-ui/icons": "4.4.3",
-    "@material-ui/lab": "4.0.0-alpha.28",
+    "@material-ui/core": "4.5.1",
+    "@material-ui/icons": "4.5.1",
+    "@material-ui/lab": "4.0.0-alpha.29",
     "@material-ui/styles": "4.5.0",
     "@sentry/browser": "5.7.0",
     "clsx": "1.0.4",
diff --git a/src/atoms/Autocomplete/index.tsx b/src/atoms/Autocomplete/index.tsx
@@ -195,3 +195,4 @@ const Autocomplete = () => {
 
 // tslint:disable-next-line:max-file-line-count
 export default Autocomplete;
+

Original file line number	Diff line number	Diff line change
`@@ -195,3 +195,4 @@ const Autocomplete = () => {`
`195`	`195`
`196`	`196`	`// tslint:disable-next-line:max-file-line-count`
`197`	`197`	`export default Autocomplete;`
	`198`	`+`