drigato ac8fadfc80 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas ... Conflicts: CREDITS airtime_mvc/application/modules/rest/controllers/MediaController.php airtime_mvc/application/views/scripts/form/support-setting.phtml		2015-01-23 16:36:31 -05:00
..
cloud_storage	SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix	2015-01-16 11:09:13 -05:00
common	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
configs	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
controllers	Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 16:36:31 -05:00
forms	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
layouts/scripts	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
modules/rest	Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 16:36:31 -05:00
services	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
upgrade	SAAS-559: Turn off sql notices during upgrade	2015-01-23 16:08:22 -05:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 16:36:31 -05:00
Bootstrap.php	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00