Albert Santoni 8b33acacd3 Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/configs/constants.php airtime_mvc/application/controllers/LoginController.php airtime_mvc/application/controllers/UserController.php airtime_mvc/public/js/airtime/preferences/preferences.js		2015-09-29 18:58:55 -04:00
..
musicdirs.js	Replaced reoccurring strings with string formatting to aid dynamic translations	2014-11-06 18:40:19 -05:00
preferences.js	Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations	2015-09-29 18:58:55 -04:00
streamsetting.js	Moved datatables translation stuff to PHP for consistency	2015-08-14 20:00:05 -04:00
support-setting.js	CC-4731: Cannot save support feedback settings	2012-12-04 16:21:45 -05:00