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-09-22 08:42:07 +02:00
parent 41e01184aa 79b873e40e
commit 18337f610d
418 changed files with 24139 additions and 3267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts
View File

@@ -11,7 +11,7 @@ describe('PlaylistEditCtrl', () => {
},
};
ctx = new PlaylistEditCtrl(null, null, null, null, { current: { params: {} } }, navModelSrv);
ctx = new PlaylistEditCtrl(null, null, null, { current: { params: {} } }, navModelSrv);
ctx.dashboardresult = [
{ id: 2, title: 'dashboard: 2' },