Albert Santoni 3c064b13a9 Merge branch '2.5.x' into saas ... Conflicts: airtime_mvc/locale/hy/LC_MESSAGES/airtime.po airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po		2015-02-18 16:03:14 -05:00
..
events	Removed console.log	2013-01-18 14:49:13 -05:00
library.js	CC-5998: Prevent users from spamming the delete button in the library	2015-02-18 15:56:28 -05: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