denise b817684972 Merge branch '2.2.x' into devel ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/models/StoredFile.php airtime_mvc/public/js/bootstrap/bootstrap.js		2012-11-07 11:21:36 -05:00
..
airtime	Merge branch '2.2.x' into devel	2012-11-07 11:21:36 -05:00
blockui	…
bootstrap	Merge branch '2.2.x' into devel	2012-11-07 11:21:36 -05:00
colorpicker/js	…
contextmenu	…
datatables	CC-4539: Advanced search: Sample rate searched on Hz, but search results	2012-10-31 12:32:40 -04:00
fullcalendar	CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings	2012-06-11 16:43:24 -04:00
jplayer	…
libs	…
plupload	…
qtip	remove console.log from javascript library :/	2012-09-19 11:04:01 -04:00
serverbrowse	-removed windows CRLF	2012-09-18 17:26:34 -04:00
sprintf	…
timepicker	…