Albert Santoni 7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/forms/Preferences.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml		2015-01-15 16:32:29 -05:00
..
airtime.mo	updated translation resources	2015-01-15 11:12:14 +00:00
airtime.po	updated translation resources	2015-01-15 11:12:14 +00:00
pro.po	Translation update, and fixed bad merge in fr_FR	2014-11-11 18:19:49 -05:00