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

..

api_clients

CC-5049:

2013-05-23 17:17:00 -04:00

icecast2

remove \r line endings

2012-10-30 13:23:09 -04:00

media-monitor

CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install

2013-05-27 13:41:36 -04:00

media-monitor2

CC-5195: Media Folder: Update media folder will block media uploader

2013-06-06 12:54:48 -04:00

monit

…

pypo

Merge branch '2.4.x'

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

python-virtualenv

CC-4989: upgrade to mutagen 1.21

2013-03-01 14:58:26 -05:00

std_err_override

Ensure only telnetliquidsoap has telnet responsibilities

2013-05-16 16:19:00 -04:00

create-pypo-user.py

…

remove-pypo-user.py

…