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

..

ACL.php

Add billing section to main menu

2014-06-20 17:25:05 -04:00

airtime-conf-production.php

CC-5895: Upgrade Propel to 1.7

2014-07-23 15:03:51 -04: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

CC-5885: Factor out cloud storage code into separate class

2014-07-11 16:16:30 -04:00

constants.php

Design and overhaul of Account Plans screen

2014-06-25 18:58:54 -04:00

db-conf.php

CC-4384: Remove annoying usage of $CC_CONFIG

2013-01-14 16:16:14 -05:00

navigation.php

typo

2014-06-20 17:29:56 -04:00