Alexander Zobnin b9ee409dc4 Merge branch 'develop-1.9' into develop ...

Conflicts:
	.gitignore
	zabbix/datasource.js
	zabbix/partials/query.editor.html
	zabbix/queryCtrl.js

2015-05-16 18:35:51 +03:00

..

partials

Replace $http to backendSrv for grafana-2-like request style.

2015-05-12 22:58:34 +03:00

datasource.js

Merge branch 'develop-1.9' into develop

2015-05-16 18:35:51 +03:00

plugin.json

Fix configs.

2015-05-05 15:46:13 +03:00

queryCtrl.js

Merge branch 'develop-1.9' into develop

2015-05-16 18:35:51 +03:00