Merge branch 'devel' of dev.sourcefabric.org:airtime into devel Conflicts: airtime_mvc/application/controllers/LibraryController.php airtime_mvc/public/js/airtime/library/library.js |
||
---|---|---|
.. | ||
plugins | ||
ApiController.php | ||
AuthController.php | ||
DashboardController.php | ||
ErrorController.php | ||
IndexController.php | ||
LibraryController.php | ||
LoginController.php | ||
NowplayingController.php | ||
PlaylistController.php | ||
PlayouthistoryController.php | ||
PluploadController.php | ||
PreferenceController.php | ||
ScheduleController.php | ||
SearchController.php | ||
ShowbuilderController.php | ||
SystemstatusController.php | ||
UserController.php | ||
UsersettingsController.php |