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
b44ca55f0c
57 changed files with 3305 additions and 3026 deletions
|
@ -6,6 +6,8 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
loading = loading.default || loading;
|
||||
layoutManager = layoutManager.default || layoutManager;
|
||||
focusManager = focusManager.default || focusManager;
|
||||
scrollHelper = scrollHelper.default || scrollHelper;
|
||||
serverNotifications = serverNotifications.default || serverNotifications;
|
||||
|
||||
function showViewSettings(instance) {
|
||||
require(['guide-settings-dialog'], function (guideSettingsDialog) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue