Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas ... Conflicts: airtime_mvc/application/views/scripts/menu.phtml		2013-09-02 15:52:43 -04:00
..
api_clients	release version updates and changelog edits.	2013-09-01 00:56:47 -04: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	Removed ugly comment	2013-08-12 16:05:44 -04:00
monit	monit alerts in saas	2013-04-04 16:30:39 -04:00
pypo	Merge branch '2.4.x' into 2.4.x-saas	2013-09-02 15:46:25 -04:00
python-virtualenv	CC-4989: upgrade to mutagen 1.21	2013-03-01 14:58:26 -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