Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas ...

Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php

2013-06-26 01:25:26 -04:00

..

pypo-copy-files.py

remove unnecessary install code for saas

2013-05-21 17:36:57 -04:00

pypo-initialize.py

CC-5232 - During playback, a reinstall may push some tracks twice

2013-06-13 12:08:25 -04:00

pypo-remove-files.py

CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade

2013-03-05 16:21:05 -05:00

pypo-uninitialize.py

CC-5005: airtime-purge doesn't remove all files

2013-03-06 12:26:07 -05:00