Alexander Zobnin d27d50527c Merge branch 'query-editor' into grafana-3.0 ...

Conflicts:
	plugins/datasource-zabbix/zabbixAPIWrapper.js

2016-01-31 10:44:12 +03:00

..

datasource-zabbix

Merge branch 'query-editor' into grafana-3.0

2016-01-31 10:44:12 +03:00

panel-triggers

Add select events option

2016-01-20 15:17:54 -02:00