feat(macaron): upgrades macaron version

This commit is contained in:
bergquist
2016-01-13 15:11:23 +01:00
parent 5de69b288f
commit 4fe72ebf69
163 changed files with 10334 additions and 6847 deletions

View File

@ -1,11 +1,11 @@
package api
import (
"github.com/Unknwon/macaron"
"gopkg.in/macaron.v1"
"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"
"github.com/go-macaron/binding"
)
// Register adds http routes