update branch with upstream

2019-03-12 21:00:35 +00:00
parent 023a1ed72f e08d7256a7
commit 4fefa4f9b6
61 changed files with 20278 additions and 19332 deletions
@@ -644,12 +644,6 @@ var AppInfo = {};
            roles: "admin",
            controller: "scripts/addpluginpage"
        });
-        defineRoute({
-            path: "/appservices.html",
-            dependencies: [],
-            autoFocus: false,
-            roles: "admin"
-        });
        defineRoute({
            path: "/autoorganizelog.html",
            dependencies: [],
@@ -739,12 +733,6 @@ var AppInfo = {};
            autoFocus: false,
            roles: "admin"
        });
-        defineRoute({
-            path: "/opensubtitles.html",
-            dependencies: [],
-            autoFocus: false,
-            roles: "admin"
-        });
        defineRoute({
            path: "/forgotpassword.html",
            dependencies: ["emby-input", "emby-button"],