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

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@
query.UserId = Dashboard.getCurrentUserId();
ApiClient.getLiveTvChannels(query).done(function (result) {
ApiClient.getLiveTvChannels(query).then(function (result) {
renderChannels(page, viewPanel, result);