drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/configs/ACL.php airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/controllers/plugins/Acl_plugin.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/modules/rest/controllers/MediaController.php airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/build/sql/schema.sql		2015-01-23 11:32:45 -05:00
..
airtime_analyzer	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
api_clients	SAAS-404: Separate the Airtime API version from the Airtime version	2014-02-14 16:22:15 -05:00
icecast2	remove \r line endings	2012-10-30 13:23:09 -04:00
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	2015-01-13 14:23:51 -05:00
python-virtualenv	SAAS-503: PYPO -> Use the REST API to download filesSAAS-503	2014-12-03 14:41:16 -05:00
std_err_override	CC-3691: Pypo needs to write stderr + stdout to the log file	2012-04-20 19:12:36 -04:00
create-pypo-user.py	CC-3572: pypo user should have shell set to /bin/false	2012-03-31 22:11:12 -04:00
remove-pypo-user.py	-create-pypo-user scripts missing an "import sys"	2011-06-16 17:30:16 -04:00