1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge branch 'master' into es6-subtitlesettings

This commit is contained in:
Dmitry Lyzo 2020-05-27 16:45:26 +03:00 committed by GitHub
commit 2a30ed6461
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
222 changed files with 5287 additions and 2717 deletions

View file

@ -1,4 +1,4 @@
define(['controllers/userpasswordpage', 'loading', 'libraryMenu', 'apphost', 'globalize', 'emby-button'], function (UserPasswordPage, loading, libraryMenu, appHost, globalize) {
define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu', 'apphost', 'globalize', 'emby-button'], function (UserPasswordPage, loading, libraryMenu, appHost, globalize) {
'use strict';
function reloadUser(page) {