Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/models/MusicDir.php python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py |
||
---|---|---|
.. | ||
install | ||
__init__.py | ||
api_client.cfg | ||
api_client.py |
Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/models/MusicDir.php python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py |
||
---|---|---|
.. | ||
install | ||
__init__.py | ||
api_client.cfg | ||
api_client.py |