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

Conflicts:
	plugins/datasource-zabbix/datasource.js

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

..

datasource-zabbix

Merge branch 'develop' into panel-triggers

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

panel-triggers

Issue #72 - changed plugin.json files and fixed templates path

2015-12-28 14:00:03 +03:00