Merge branch '2.3.x' into devel
This commit is contained in:
commit
5ceeb88899
23 changed files with 394 additions and 118 deletions
|
@ -71,7 +71,7 @@ function showForIcecast(ele){
|
|||
div.find("#outputMountpoint-element").show()
|
||||
div.find("#outputUser-label").show()
|
||||
div.find("#outputUser-element").show()
|
||||
div.find("select[id$=data-type]").find("option[value='ogg']").attr("disabled","");
|
||||
div.find("select[id$=data-type]").find("option[value='ogg']").removeAttr("disabled");
|
||||
}
|
||||
|
||||
function checkLiquidsoapStatus(){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue