Albert Santoni d5b969f94f Merge branch '2.5.x' into saas ... Conflicts: airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml		2015-01-13 21:31:57 -05: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 '2.5.x' into saas	2015-01-13 21:31:57 -05:00
streamsetting.js	Replaced reoccurring strings with string formatting to aid dynamic translations	2014-11-06 18:40:19 -05:00
support-setting.js	CC-4731: Cannot save support feedback settings	2012-12-04 16:21:45 -05:00