Commit Graph

2 Commits

Author SHA1 Message Date
Alexander Zobnin
84dd066aac Merge branch 'develop' into panel-triggers
Conflicts:
	plugins/datasource-zabbix/datasource.js
2016-01-09 21:42:31 +03:00
Alexander Zobnin
72ad872397 Move plugins to separate directories for support Grafana
external plugins model.
2015-12-28 13:08:17 +03:00