Merge remote-tracking branch 'origin/master' into standalone
Conflicts: package.json src/components/appRouter.js src/components/require/requiretext.js src/config.json src/scripts/clientUtils.js src/scripts/settings/webSettings.js src/scripts/site.js
This commit is contained in:
+13
-19
@@ -23,25 +23,19 @@
|
||||
}
|
||||
],
|
||||
"servers": [],
|
||||
"fonts": [
|
||||
"https://repo.jellyfin.org/releases/other/jellyfin-noto/font-faces.css",
|
||||
"https://repo.jellyfin.org/releases/other/jellyfin-noto/css/KR.css",
|
||||
"https://repo.jellyfin.org/releases/other/jellyfin-noto/css/JP.css",
|
||||
"https://repo.jellyfin.org/releases/other/jellyfin-noto/css/SC.css"
|
||||
],
|
||||
"plugins": [
|
||||
"plugins/playAccessValidation/plugin",
|
||||
"plugins/experimentalWarnings/plugin",
|
||||
"plugins/htmlAudioPlayer/plugin",
|
||||
"plugins/htmlVideoPlayer/plugin",
|
||||
"plugins/photoPlayer/plugin",
|
||||
"plugins/comicsPlayer/plugin",
|
||||
"plugins/bookPlayer/plugin",
|
||||
"plugins/youtubePlayer/plugin",
|
||||
"plugins/backdropScreensaver/plugin",
|
||||
"plugins/pdfPlayer/plugin",
|
||||
"plugins/logoScreensaver/plugin",
|
||||
"plugins/sessionPlayer/plugin",
|
||||
"plugins/chromecastPlayer/plugin"
|
||||
"playAccessValidation/plugin",
|
||||
"experimentalWarnings/plugin",
|
||||
"htmlAudioPlayer/plugin",
|
||||
"htmlVideoPlayer/plugin",
|
||||
"photoPlayer/plugin",
|
||||
"comicsPlayer/plugin",
|
||||
"bookPlayer/plugin",
|
||||
"youtubePlayer/plugin",
|
||||
"backdropScreensaver/plugin",
|
||||
"pdfPlayer/plugin",
|
||||
"logoScreensaver/plugin",
|
||||
"sessionPlayer/plugin",
|
||||
"chromecastPlayer/plugin"
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user