Marcus Efraimsson fce1e3f7f1 Merge branch 'master' into 10630_folder_api		2018-02-19 13:32:45 +01:00
..
AlertRuleList	refactoring: alert rule query refactoring (#10941)	2018-02-16 13:56:04 +01:00
ManageDashboards	Merge branch 'master' into 10630_folder_api	2018-02-12 15:14:41 +01:00
ServerStats	dashfolders: New snapshot since we changed from defaultValue to value per latest React documentation #10275	2018-01-25 15:37:49 +01:00
IContainerProps.ts	dashfolders: Rename UserPicker folder => Picker. Inject the permission-store in the FolderPermissions-container instead of the Permissions component, add the PermissionsStore to the RootStore and and the error-message to the Permissions-store #10275	2018-01-25 15:36:04 +01:00