drigato 0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas ...

Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php

2014-11-03 12:29:58 -05:00

..

controllers

Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

2014-11-03 12:29:58 -05:00

helpers

Changed RestAuth functions to static for ease-of-access

2014-09-18 10:35:26 -04:00

views/scripts/media

Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

2014-11-03 12:29:58 -05:00

Bootstrap.php

Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

2014-11-03 12:29:58 -05:00