Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
bergquist committed 2016-02-25 15:05:20 +01:00
commit 83662b5195
1 file changed
+2 -1
@@ -4,5 +4,6 @@
"id": "prometheus",
"metrics": true,
"annotations": true
"annotations": true,
"defaultMatchFormat": "pipe"
}