Merge branch 'master' into migrate-to-ES6-58
This commit is contained in:
commit
b8c4871004
26 changed files with 551 additions and 502 deletions
|
@ -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 = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue