Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player

Browse source
This commit is contained in:
drigato 2015-03-23 15:54:04 -04:00
commit e2ca218ac2
12 changed files with 190 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -1309,7 +1309,7 @@ class ApiController extends Zend_Controller_Action
}
public function getStreamParametersAction() {
$streams = array("s1", "s2", "s3");
$streams = array("s1", "s2", "s3", "s4");
$stream_params = array();
foreach ($streams as $s) {
$stream_params[$s] =