Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel ... Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/PlaylistController.php airtime_mvc/application/models/Playlist.php python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py		2012-07-16 14:31:03 -04:00
..
airtimefilemonitor	Merge branch '2.1.x' into devel	2012-07-16 14:31:03 -04:00
install	get rid of pypo permissions since it now runs as root	2012-07-05 16:32:54 -04:00
airtime-media-monitor	CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder	2012-05-14 19:53:07 -04:00
airtime-media-monitor-init-d	CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder	2011-09-28 12:15:13 -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	SAAS-56: RabbitMQ virtual host support	2011-12-05 21:05:28 -05:00
media_monitor.py	-Remove useless api_client interface	2012-07-12 16:51:11 -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