Merge branch 'master' into develop

This commit is contained in:
Torkel Ödegaard
2017-10-12 16:32:44 +02:00
41 changed files with 691 additions and 191 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
"company": "Grafana Labs"
},
"name": "grafana",
"version": "4.6.0-pre1",
"version": "4.6.0-beta1",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana.git"