Conflicts: VERSION airtime_mvc/application/models/Systemstatus.php install_minimal/include/airtime-constants.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/media-monitor/install/media-monitor-copy-files.py python_apps/media-monitor/install/media-monitor-initialize.py python_apps/pypo/install/pypo-initialize.py python_apps/pypo/liquidsoap_bin python_apps/pypo/pypopush.py utils/airtime-log.php |
||
---|---|---|
.. | ||
airtime-import | ||
airtime-check-system | ||
airtime-check-system.php | ||
airtime-log | ||
airtime-log.php | ||
airtime-nuke.sh | ||
airtime-test-soundcard | ||
airtime-test-soundcard.py | ||
airtime-test-stream | ||
airtime-test-stream.py | ||
airtime-update-db-settings | ||
airtime-update-db-settings.py | ||
phone_home_stat | ||
phone_home_stat.php | ||
rabbitmq-update-pid.sh | ||
rivendell-converter.sh | ||
soundcloud-uploader | ||
soundcloud-uploader.php |