Merge branch 'master' into backend

2020-01-16 12:21:22 +03:00
parent 3581a818fc 5b211d80a9
commit f7adf0e379
9 changed files with 486 additions and 425 deletions
--- a/package.json
+++ b/package.json
@@ -30,10 +30,10 @@
    "@babel/preset-env": "^7.8.3",
    "@babel/preset-react": "^7.8.3",
    "@emotion/core": "^10.0.27",
-    "@grafana/data": "canary",
-    "@grafana/runtime": "canary",
-    "@grafana/toolkit": "canary",
-    "@grafana/ui": "canary",
+    "@grafana/data": "^6.5.3",
+    "@grafana/runtime": "^6.5.3",
+    "@grafana/toolkit": "^6.5.3",
+    "@grafana/ui": "^6.5.3",
    "@types/classnames": "^2.2.9",
    "@types/grafana": "github:CorpGlory/types-grafana",
    "@types/jest": "^23.1.1",