api.go
7.31 KB
-
Merge branch 'master' of github.com:grafana/grafana into externalPlugin · 0903d554
Conflicts: pkg/api/api.go pkg/api/api_plugin.go pkg/api/datasources.go pkg/api/frontendsettings.go pkg/api/index.go pkg/plugins/models.go pkg/plugins/plugins.go
woodsaj committed