Merge branch 'master' into alerting_definitions

2016-05-30 08:26:08 +02:00
parent e80000ce94 f8a535c6e8
commit 1686d86c3b
68 changed files with 768 additions and 219 deletions
@@ -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