Merge branch 'master' of github.com:grafana/grafana

Conflicts: examples/nginx-app/package.json examples/nginx-app/plugin.json
2016-03-11 12:39:10 +01:00
parent fc54c01f01 3fd420c901
commit ece8a925a6
52 changed files with 155 additions and 291 deletions
@@ -10,6 +10,10 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )

+type AnyId struct {
+	Id int64 `json:"id"`
+}
+
 type LoginCommand struct {
 	User     string `json:"user" binding:"Required"`
 	Password string `json:"password" binding:"Required"`