mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
8a4b8cf1b0
@ -86,5 +86,6 @@ require.config({
|
||||
datepicker: ['jquery', 'bootstrap'],
|
||||
|
||||
elasticjs: ['angular', '../vendor/elasticjs/elastic']
|
||||
}
|
||||
},
|
||||
waitSeconds: 60,
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user