Merge remote-tracking branch 'upstream/master' into update-xorm

2018-03-20 19:21:58 +01:00
parent 3ca1e06509 70630d742e
commit 1cef373d16
139 changed files with 80643 additions and 943 deletions
@@ -24,6 +24,8 @@ import (
 	"github.com/go-xorm/xorm"
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
+
+	_ "github.com/grafana/grafana/pkg/tsdb/mssql"
 )

 type DatabaseConfig struct {