carl bergquist d4e98cd9bc Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks ... Conflicts: pkg/plugins/plugins.go closes #2899 closes #2834		2015-12-16 09:21:52 +01:00
..
models.go	feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch	2015-12-15 10:28:52 +01:00
plugins_test.go	really fix unit tests.	2015-11-27 17:17:27 +08:00
plugins.go	Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks	2015-12-16 09:21:52 +01:00