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 |
||
---|---|---|
.. | ||
airtime | ||
colorpicker/js | ||
contextmenu | ||
datatables | ||
fullcalendar | ||
jplayer | ||
libs | ||
meioMask | ||
plupload | ||
qtip | ||
serverbrowse | ||
sprintf | ||
timepicker |