Merge branch 'master' into es6-subtitlesettings

2020-05-27 16:45:26 +03:00
parent 9469c208e1 2290266634
commit 2a30ed6461
222 changed files with 5287 additions and 2717 deletions
@@ -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) {