Conflicts: VERSION airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Nowplaying.php airtime_mvc/application/models/Show.php airtime_mvc/application/models/airtime/CcShowInstances.php |
||
---|---|---|
.. | ||
media-monitor-copy-files.py | ||
media-monitor-initialize.py | ||
media-monitor-remove-files.py | ||
media-monitor-uninitialize.py | ||
media-monitor-uninstall.py |