woodsaj 0903d5541b Merge branch 'master' of github.com:grafana/grafana into externalPlugin ...

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

2015-12-22 00:23:24 +08:00

..

models.go

Merge branch 'master' of github.com:grafana/grafana into externalPlugin

2015-12-22 00:23:24 +08:00

plugins_test.go

really fix unit tests.

2015-11-27 17:17:27 +08:00

plugins.go

Merge branch 'master' of github.com:grafana/grafana into externalPlugin

2015-12-22 00:23:24 +08:00