Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/forms/EmailServerPreferences.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/forms/Preferences.php airtime_mvc/application/forms/SupportSettings.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_email_server.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/menu.phtml airtime_mvc/application/views/scripts/schedule/add- show-form.phtml		2012-11-06 17:23:32 -05:00
..
api_clients	Changed APC to new-style classes	2012-10-29 11:43:39 -04:00
icecast2	remove \r line endings	2012-10-30 13:23:09 -04:00
media-monitor	Merge branch '2.2.x'	2012-10-26 00:31:12 -04:00
media-monitor2	cc-4672: added dirty workaround to fix this issue	2012-11-06 16:16:37 -05:00
monit	CC-3520: Change default password of monit	2012-04-01 00:20:47 -04:00
pypo	Merge branch '2.2.x' into 2.2.x-saas	2012-11-06 16:11:51 -05:00
python-virtualenv	cc-4237: removed fat depenendancies	2012-08-17 12:57:42 -04: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