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 |
||
---|---|---|
.. | ||
configs | ||
controllers | ||
forms | ||
layouts/scripts | ||
logging | ||
models | ||
validate | ||
views | ||
Bootstrap.php |