IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-10-24 09:06:09 +02:00
parent fff0fa2aee 4d72323623
commit b44daaabf2
69 changed files with 1284 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/plugins/plugin_loader.ts
View File

@@ -15,7 +15,7 @@ import * as flatten from 'app/core/utils/flatten';
import * as ticks from 'app/core/utils/ticks';
import {impressions} from 'app/features/dashboard/impression_store';
import builtInPlugins from './built_in_plugins';
import d3 from 'vendor/d3/d3';
import * as d3 from 'd3';
// rxjs
import {Observable} from 'rxjs/Observable';