Albert Santoni 338fd06f81 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas ... Conflicts: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml		2014-06-25 19:03:13 -04:00
..
header.phtml	CC-5354: Remove PHP short open tags for better compatibility	2013-10-04 14:15:23 -04:00
trialBox.phtml	Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas	2014-06-25 19:03:13 -04:00