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 remote-tracking branch 'origin/master' into reactify-stackdriver

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
Erik Sundell
2019-01-09 14:33:41 +01:00
parent d51f91f54b 2d16c29a1a
commit 92121cacd1
64 changed files with 670 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/Select/Select.tsx
View File

@@ -11,7 +11,7 @@ import OptionGroup from './OptionGroup';
import IndicatorsContainer from './IndicatorsContainer';
import NoOptionsMessage from './NoOptionsMessage';
import ResetStyles from './ResetStyles';
import CustomScrollbar from '../CustomScrollbar/CustomScrollbar';
import { CustomScrollbar } from '@grafana/ui';
export interface SelectOptionItem {
label?: string;