Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/controllers/ScheduleController.php install_minimal/airtime-install install_minimal/include/AirtimeInstall.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/pypo/pypofetch.py python_apps/pypo/pypopush.py |
||
---|---|---|
.. | ||
add-show-form.phtml | ||
add-show.phtml | ||
cancel-current-show.phtml | ||
cancel-show.phtml | ||
clear-show.phtml | ||
delete-show.phtml | ||
edit-show.phtml | ||
event-feed.phtml | ||
find-playlists-partial.phtml | ||
find-playlists.ajax.phtml | ||
find-playlists.phtml | ||
get-current-playlist.phtml | ||
get-form.phtml | ||
get-show-data.phtml | ||
index.phtml | ||
make-context-menu.phtml | ||
move-show.phtml | ||
remove-group.phtml | ||
resize-show.phtml | ||
schedule-show-dialog.phtml | ||
schedule-show.phtml | ||
scheduled-content.phtml | ||
show-content-dialog.phtml | ||
show-list.phtml |