3
0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
grafana/pkg/services
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
..
eventpublisher no unbound recursion in publish() 2015-05-18 10:04:01 -04:00
notifications fix(email notifications): added error handling to email template parsing, fixes 2015-09-08 10:57:47 +02:00
search Fixed case insensitive search for file based dashboards, Fixes 2015-06-30 08:17:28 +02:00
sqlstore Merge branch 'master' of github.com:grafana/grafana into externalPlugin 2015-12-22 00:23:24 +08:00