Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

This commit is contained in:
Naomi 2013-10-15 14:31:45 -04:00
commit 63d4ee9a26

View file

@ -586,8 +586,8 @@ function alertShowErrorAndReload(){
window.location.reload(); window.location.reload();
} }
preloadEventFeed();
$(document).ready(function(){ $(document).ready(function(){
preloadEventFeed();
checkSCUploadStatus(); checkSCUploadStatus();
getCurrentShow(); getCurrentShow();
}); });