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

@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/Unknwon/macaron"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"