opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 02:29:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new_macaron'

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-01-13 15:48:49 +01:00
parent 77c362af8d 2cf0dc2cb2
commit 6da3af5e89
156 changed files with 10337 additions and 6330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/middleware/middleware.go
View File

@ -4,7 +4,7 @@ import (
"strconv"
"strings"
"github.com/Unknwon/macaron"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/apikeygen"