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

This commit is contained in:
Cameron 2020-08-05 19:28:06 +01:00 committed by GitHub
commit b8c4871004
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 551 additions and 502 deletions

View file

@ -4,6 +4,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
playbackManager = playbackManager.default || playbackManager;
loading = loading.default || loading;
layoutManager = layoutManager.default || layoutManager;
focusManager = focusManager.default || focusManager;
function getInitialLiveTvQuery(instance, params) {
var query = {