carl bergquist 5bdf0cd136 Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval ... Conflicts: public/app/plugins/datasource/elasticsearch/partials/config.html		2015-12-17 09:53:02 +01:00
..
datasource	Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval	2015-12-17 09:53:02 +01:00
panels	Merge branch 'relative' of https://github.com/utkarshcmu/grafana into utkarshcmu-relative	2015-12-16 16:09:44 +01:00
plugin_api.md	feat(plugins): made panels work as plugins	2015-11-21 13:46:43 +01:00