Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/models/MusicDir.php install_full/ubuntu/airtime-full-install install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py |
||
---|---|---|
.. | ||
api_clients | ||
icecast2 | ||
media-monitor | ||
monit | ||
pypo | ||
python-virtualenv | ||
show-recorder | ||
create-pypo-user.py | ||
remove-pypo-user.py |