Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts: dev_tools/pr.sh
This commit is contained in:
commit
6d39af6fb9
6 changed files with 35 additions and 18 deletions
|
@ -34,5 +34,5 @@ icecast_genre = "genre"
|
|||
#liquidsoap output settings #
|
||||
###########################################
|
||||
output_sound_device = false
|
||||
output_icecast_vorbis = false
|
||||
output_icecast_mp3 = true
|
||||
output_icecast_vorbis = true
|
||||
output_icecast_mp3 = false
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue