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 |
||
---|---|---|
.. | ||
buttons | ||
common | ||
dashboard | ||
library | ||
login | ||
nowplaying | ||
playouthistory | ||
preferences | ||
schedule | ||
showbuilder | ||
status | ||
user | ||
utilities |