Merge branch 'master' into migrate-to-ES6-48

2020-08-02 09:14:01 +01:00
parent 91cd1a75d7 dbd6d2fb35
commit 0e409e2717
91 changed files with 679 additions and 595 deletions
@@ -2,6 +2,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
    'use strict';

    playbackManager = playbackManager.default || playbackManager;
+    loading = loading.default || loading;

    function getInitialLiveTvQuery(instance, params) {
        var query = {