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 |
||
---|---|---|
.. | ||
events | ||
library.js | ||
main_library.js | ||
plupload.js | ||
spl.js |
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 |
||
---|---|---|
.. | ||
events | ||
library.js | ||
main_library.js | ||
plupload.js | ||
spl.js |