Merge branch 'master' into alerting_definitions

This commit is contained in:
bergquist committed 2016-05-30 08:26:08 +02:00
commit 1686d86c3b
68 files changed
+768 -219

No files matched your search

+1 -1
View File
@@ -25,7 +25,7 @@ import (
"github.com/grafana/grafana/pkg/social"
)
var version = "3.0.0-beta4"
var version = "3.1.0"
var commit = "NA"
var buildstamp string
var build_date string