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 |
||
---|---|---|
.. | ||
install | ||
__init__.py | ||
api_client.cfg | ||
api_client.py |