milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-19 14:49:42 -05:00
parent bcfee41a57
commit d33230d361
97 changed files with 1205 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1915,7 +1915,7 @@
if (currentItem && currentItem.Id == itemId) {
if (currentItem.Type == 'Recording') {
Dashboard.navigate('livetv.html');
LibraryBrowser.showTab('livetv.html', 3);
} else {
Dashboard.navigate('index.html');
}