Alexander Zobnin 84dd066aac Merge branch 'develop' into panel-triggers ...

Conflicts:
	plugins/datasource-zabbix/datasource.js

2016-01-09 21:42:31 +03:00

..

annotations.editor.html

Merge branch 'develop' into panel-triggers

2016-01-09 21:42:31 +03:00

config.html

Move plugins to separate directories for support Grafana

2015-12-28 13:08:17 +03:00

query.editor.html

Move plugins to separate directories for support Grafana

2015-12-28 13:08:17 +03:00

query.options.html

Move plugins to separate directories for support Grafana

2015-12-28 13:08:17 +03:00