Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
9991cbd16b
39 changed files with 596 additions and 363 deletions
|
@ -68,7 +68,6 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
|
|||
if($disable_all){
|
||||
$bitrate->setAttrib("disabled", "disabled");
|
||||
}
|
||||
$this->addElement($type);
|
||||
$this->addElement($bitrate);
|
||||
|
||||
$output = new Zend_Form_Element_Select('output');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue