Merge branch '2.3.x' into devel

2013-04-03 16:48:19 -04:00 · 2013-04-03 16:48:19 -04:00 · e2e6a4263c
commit e2e6a4263c
parent 563f5b64d2 ec7c898f5a
4 changed files with 2 additions and 5 deletions
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@ -1,7 +1,6 @@
 %include "/etc/airtime/liquidsoap.cfg"

 set("log.file.path", log_file)
-set("log.stdout", true)
 set("server.telnet", true)
 set("server.telnet.port", 1234)
 set("init.daemon.pidfile.path", "/var/run/airtime-liquidsoap.pid")