martin 5190a0c24c Merge branch '1.9.1' into devel ...

Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py

2011-10-04 13:59:27 -04:00

..

install

CC-2567: Install api_client separately from pypo

2011-07-19 12:07:31 -04:00

__init__.py

CC-2016: Rearrange python scripts for reusability

2011-03-24 00:00:46 -04:00

api_client.cfg

CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder

2011-09-16 17:51:28 -04:00

api_client.py

Merge branch '1.9.1' into devel

2011-10-04 13:59:27 -04:00