Config file
Merge branch 'master' of https://github.com/s4hc/grafana