Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas ... Conflicts: airtime_mvc/application/forms/AddShowWhen.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/schedule/add-show-form.phtml		2013-12-17 17:20:38 -05:00
..
api_clients	Update version number in airtime-constants.php	2013-12-09 15:30:30 -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	Remove swear words from source code	2013-09-23 16:16:51 +01:00
monit	monit alerts in saas	2013-04-04 16:30:39 -04:00
pypo	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
python-virtualenv	CC-5328 Fix virtualenv version check for newer distros	2013-09-25 13:03:35 +01: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