Merge branch 'master' into azure-monitor

2019-01-28 19:23:34 +01:00
parent 96ffa9d797 f09c4608c2
commit e4f4cb814c
378 changed files with 8050 additions and 3821 deletions
@@ -5,7 +5,7 @@
    "company": "Grafana Labs"
  },
  "name": "grafana",
-  "version": "5.5.0-pre1",
+  "version": "6.0.0-pre1",
  "repository": {
    "type": "git",
    "url": "http://github.com/grafana/grafana.git"
@@ -192,7 +192,8 @@
    "slate-react": "^0.12.4",
    "tether": "^1.4.0",
    "tether-drop": "https://github.com/torkelo/drop/tarball/master",
-    "tinycolor2": "^1.4.1"
+    "tinycolor2": "^1.4.1",
+    "xss": "^1.0.3"
  },
  "resolutions": {
    "caniuse-db": "1.0.30000772",