Merge branch 'new_macaron'

2016-01-13 15:48:49 +01:00
parent 77c362af8d 2cf0dc2cb2
commit 6da3af5e89
156 changed files with 10337 additions and 6330 deletions
@@ -1,11 +1,11 @@
 package api

 import (
-	"github.com/Unknwon/macaron"
+	"github.com/go-macaron/binding"
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
-	"github.com/macaron-contrib/binding"
+	"gopkg.in/macaron.v1"
 )

 // Register adds http routes