plugins.go
3 KB
-
Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into… · d4e98cd9
Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks Conflicts: pkg/plugins/plugins.go closes #2899 closes #2834
carl bergquist committed