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
..
airtimefilemonitor	CC-4888: Add unofficial support for AAC plugin	2013-02-26 12:06:22 -05:00
install	remove unnecessary install code for saas	2013-05-21 17:36:57 -04:00
airtime-media-monitor	cc-4105: updated config and installation scripts	2012-08-14 14:50:43 -04:00
airtime-media-monitor-init-d	CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install	2013-05-27 13:41:36 -04:00
logging.cfg	CC-2633: media monitor crashes on non-ascii files and metadata	2011-08-05 15:12:55 -04:00
media-monitor.cfg	cc-4235: removed some magic to find bug	2012-08-16 10:26:57 -04:00
media_monitor.py	cc-4105: updated config and installation scripts	2012-08-14 14:50:43 -04:00
mm1.py	cc-4105: added some changes to ease installation	2012-08-14 14:50:43 -04:00
monit-airtime-media-monitor.cfg	CC-2888: Create a monit file for each airtime component	2011-09-26 14:40:26 -04:00