Conflicts: VERSION airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/Show.php airtime_mvc/public/js/airtime/dashboard/helperfunctions.js install_minimal/include/airtime-constants.php python_apps/api_clients/api_client.py python_apps/pypo/pypocli.py python_apps/pypo/pypofetch.py |
||
---|---|---|
.. | ||
airtimefilemonitor | ||
propel | ||
airtime-monit.cfg.190 | ||
airtime-upgrade.php | ||
airtime.conf.190 | ||
api_client.cfg.190 | ||
conf.php | ||
liquidsoap.cfg.190 | ||
logging.cfg | ||
media-monitor-upgrade.py | ||
media-monitor.cfg.190 | ||
pypo.cfg.190 | ||
recorder.cfg.190 | ||
storDump.txt |