Merge branch 'pluginlist'

2016-04-11 21:10:54 -04:00
parent 7031645f4b 6ce934f1dd
commit 497e9343aa
46 changed files with 866 additions and 180 deletions
@@ -24,7 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/social"
 )

-var version = "3.0.0-pre1"
+var version = "3.0.0-beta2"
 var commit = "NA"
 var buildstamp string
 var build_date string