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

wip: panel-header: More merge conflicts during cherry pick

Browse Source
This commit is contained in:
Johannes Schill
2018-11-06 15:03:56 +01:00
parent dbf7f3fb61
commit 49550ccedf
7 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/dashgrid/DashboardPanel.tsx
View File

@@ -125,7 +125,7 @@ export class DashboardPanel extends PureComponent<Props, State> {
// withMenuOptions={pluginExports.withMenuOptions}
panel={this.props.panel}
dashboard={this.props.dashboard}
moduleMenu={pluginExports.moduleMenu}
getMenuAdditional={pluginExports.getMenuAdditional}
/>
</div>
{this.props.panel.isEditing && (