mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' into migrate-to-ES6-58
This commit is contained in:
commit
b8c4871004
26 changed files with 551 additions and 502 deletions
|
@ -5,6 +5,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
browser = browser.default || browser;
|
||||
loading = loading.default || loading;
|
||||
layoutManager = layoutManager.default || layoutManager;
|
||||
focusManager = focusManager.default || focusManager;
|
||||
|
||||
function showViewSettings(instance) {
|
||||
require(['guide-settings-dialog'], function (guideSettingsDialog) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue