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
..
ACL.php	Add billing section to main menu	2014-06-20 17:25:05 -04:00
airtime-conf-production.php	- temp commit	2013-01-14 14:43:02 -05:00
airtime-conf.php	Files auto-updated by Propel	2014-09-16 18:26:18 -04:00
application.ini	Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04	2014-08-28 17:01:03 -04:00
classmap-airtime-conf.php	Files auto-updated by Propel	2014-09-16 18:26:18 -04:00
conf.php	Double equals typo *ducks*	2014-04-22 15:56:29 -04:00
constants.php	Merge branch '2.5.x-albertenhancements' into saas	2015-01-15 16:32:29 -05:00
db-conf.php	CC-4384: Remove annoying usage of $CC_CONFIG	2013-01-14 16:16:14 -05:00
navigation.php	Merge branch '2.5.x-albertenhancements' into saas	2015-01-15 16:32:29 -05:00