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

Merge branch '2.5.x' into 2.5.x-saas

Browse source 
Conflicts:
	python_apps/pypo/listenerstat.py
This commit is contained in:
Albert Santoni 2014-02-05 17:35:59 -05:00
commit 02a96646e1
27 changed files with 15828 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/pypo/liquidsoap_scripts/notify.sh
View file

@ -11,4 +11,4 @@ SCRIPT=`readlink -f $0`
SCRIPTPATH=`dirname $SCRIPT`
cd ${SCRIPTPATH}/../
timeout 45 python pyponotify.py "$@"
timeout --signal=KILL 45 python pyponotify.py "$@"