mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode
# Conflicts: # src/components/guide/guide.js # src/components/mediainfo/mediainfo.js # src/components/multiselect/multiselect.js # src/components/playback/brightnessosd.js # src/components/recordingcreator/recordingbutton.js # src/components/userdatabuttons/emby-ratingbutton.js # src/controllers/favorites.js
This commit is contained in:
commit
080b3365d6
145 changed files with 1438 additions and 4767 deletions
|
@ -29,7 +29,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
|
|||
}
|
||||
|
||||
userSettings.set(settingsKey + '-imageType', context.querySelector('.selectImageType').value);
|
||||
}
|
||||
}
|
||||
|
||||
function centerFocus(elem, horiz, on) {
|
||||
require(['scrollHelper'], function (scrollHelper) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue