Martin Konecny 2a0c9769aa Merge branch '2.4.x' ...

Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	python_apps/pypo/liquidsoap_scripts/fdkaac.liq
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/telnetliquidsoap.py

2013-06-14 16:45:52 -04:00

..

airtime-liquidsoap-init-d

Merge branch '2.4.x'

2013-05-30 15:21:32 -04:00

airtime-playout-init-d

Merge branch '2.4.x'

2013-05-27 14:46:48 -04:00

monit-airtime-liquidsoap.cfg

Merge branch '2.4.x'

2013-05-30 15:21:32 -04:00

monit-airtime-playout.cfg

Major reorganization of the pypo directory.

2013-05-16 13:22:15 -04:00

monit-pre530-airtime-liquidsoap.cfg

Merge branch '2.4.x'

2013-06-14 16:45:52 -04:00

pypo-copy-files.py

Major reorganization of the pypo directory.

2013-05-16 13:22:15 -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

pypo.cfg

Major reorganization of the pypo directory.

2013-05-16 13:22:15 -04:00