drigato f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/application/Bootstrap.php		2014-11-26 10:35:48 -05:00
..
events	Removed console.log	2013-01-18 14:49:13 -05:00
library.js	CC-5430 : sorting settings not saved on library datatable	2013-10-16 18:14:07 -04:00
plupload.js	Merge pull request #75 - Saas relder csrf delete file	2014-10-29 17:55:42 -04:00
spl.js	Replaced reoccurring strings with string formatting to aid dynamic translations	2014-11-06 18:40:19 -05:00