Merge branch 'master' into alerting

This commit is contained in:
Torkel Ödegaard
2016-07-27 09:45:16 +02:00
128 changed files with 5996 additions and 13397 deletions

View File

@@ -162,7 +162,7 @@ class GraphCtrl extends MetricsPanelCtrl {
}
zoomOut(evt) {
this.publishAppEvent('zoom-out', evt);
this.publishAppEvent('zoom-out', 2);
}
onDataSnapshotLoad(snapshotData) {