drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/configs/ACL.php airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/controllers/plugins/Acl_plugin.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/modules/rest/controllers/MediaController.php airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/build/sql/schema.sql		2015-01-23 11:32:45 -05:00
..
airtime.mo	updated translation resources	2015-01-19 13:52:08 +00:00
airtime.po	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2015-01-22 11:29:38 -05:00
pro.po	Translation update, and fixed bad merge in fr_FR	2014-11-11 18:19:49 -05:00