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 |
||
---|---|---|
.. | ||
css | ||
images/datatables | ||
install | ||
js | ||
.htaccess | ||
favicon.ico | ||
index.php |