graph.js
14.6 KB
-
Merge branch 'Bps' of https://github.com/gitbisector/grafana into units · 1a49d51d
Conflicts: src/app/panels/graph/axisEditor.html src/app/panels/singlestat/editor.html
Torkel Ödegaard committed
Conflicts: src/app/panels/graph/axisEditor.html src/app/panels/singlestat/editor.html