Commit c63f1425 by Torkel Ödegaard

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

parents 660dc09f 3cb95fb4
......@@ -126,6 +126,7 @@ import 'vendor/flot/jquery.flot.stackpercent';
import 'vendor/flot/jquery.flot.fillbelow';
import 'vendor/flot/jquery.flot.crosshair';
import 'vendor/flot/jquery.flot.dashes';
import 'vendor/flot/jquery.flot.gauge';
const flotDeps = [
'jquery.flot',
......@@ -137,6 +138,7 @@ const flotDeps = [
'jquery.flot.selection',
'jquery.flot.stackpercent',
'jquery.flot.events',
'jquery.flot.gauge',
];
for (let flotDep of flotDeps) {
exposeToPlugin(flotDep, { fakeDep: 1 });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment