Conflicts: VERSION airtime_mvc/application/configs/conf.php airtime_mvc/application/models/Playlist.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/Shows.php airtime_mvc/application/models/StoredFile.php airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/user/remove-user.phtml airtime_mvc/public/js/airtime/schedule/add-show.js airtime_mvc/public/js/airtime/schedule/schedule.js install/airtime-upgrade.php install/include/AirtimeInstall.php python_apps/api_clients/api_client.py utils/airtime-clean-storage utils/airtime-clean-storage.php utils/airtime-import utils/airtime-import.php |
||
---|---|---|
.. | ||
airtime-recorder | ||
dashboard | ||
error | ||
form | ||
index | ||
library | ||
login | ||
nowplaying | ||
partialviews | ||
playlist | ||
plupload | ||
preference | ||
recorder | ||
schedule | ||
search | ||
user | ||
menu.phtml |