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 data-source-settings-to-react

Browse Source
This commit is contained in:
Peter Holmberg
2018-11-01 13:52:53 +01:00
parent 6493f96ac7 28b0ae1d82
commit f15ed848f9
198 changed files with 6366 additions and 2577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/datasources/settings/BasicSettings.tsx
View File

@@ -1,5 +1,5 @@
import React, { SFC } from 'react';
import { Label } from '../../../core/components/Forms/Forms';
import { Label } from 'app/core/components/Label/Label';
export interface Props {
dataSourceName: string;