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
..
DoctrineMigrations	Merge branch '2.1.x' into devel	2012-06-29 10:57:14 -04:00
include	Fixed a fresh install bug that wasn't using composer installs.	2014-10-14 16:54:58 -04:00
upgrades	Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas	2014-04-25 00:43:22 -04:00
airtime-dircheck.php	CC-2518: Auto install script for manual install	2011-07-19 17:30:23 -04:00
airtime-install	Fixed a bunch of installer stuff for Naomi	2014-04-23 12:21:39 -04:00
airtime-php.ini	CC-2819: Upgrade from 1.8.2 to 1.9.4-RC2 fails on Debian squeeze with 'Failed sql query'	2011-09-14 16:47:07 -04:00
airtime-uninstall	CC-5071: Better RabbitMQ passwords	2013-05-08 15:53:53 -04:00