Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
sintonia/python_apps
History
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
..
airtime_analyzer Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-03 12:29:58 -05:00
api_clients SAAS-404: Separate the Airtime API version from the Airtime version 2014-02-14 16:22:15 -05:00
icecast2
media-monitor Merge branch '2.4.x' into 2.4.x-saas 2013-06-26 01:25:26 -04:00
media-monitor2 CC-5668: Weekly recordings get overwritten 2014-06-09 15:04:35 -04:00
monit Commented out monit config lines to fix install error 2014-09-16 18:20:11 -04:00
pypo Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-03 12:29:58 -05:00
python-virtualenv CC-5891: Install apache-libcloud under virtualenv 2014-07-10 17:31:27 -04:00
std_err_override
create-pypo-user.py
remove-pypo-user.py