Torkel Ödegaard 05697d5ecd Merge branch 'master' into alerting ... Conflicts: conf/sample.ini		2016-08-17 10:03:33 +02:00
..
grafana-cli	feat(cli): add default plugin folder for MAC OS	2016-08-15 08:54:35 +02:00
grafana-server	feat(alerting): lots of progress on notifications, refactored them out to their own package, restored webhook notitication and added slack notification	2016-07-27 12:09:55 +02:00