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 'develop-settings-links' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-13 18:08:12 +01:00
parent 7f0440fded e99f846a6f
commit 2765c2ecc7
4 changed files with 293 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/settings/settings.html
View File

@@ -76,7 +76,7 @@
</div>
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'links'" >
<dash-links-editor></dash-links-editor>
<dash-links-editor dashboard="ctrl.dashboard"></dash-links-editor>
</div>
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'versions'" >