Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py

2012-03-12 17:52:17 -04:00

..

api_clients

CC-3336: Refactor schedule API used by pypo

2012-02-29 21:27:42 -05:00

icecast2

CC-2886: changing file name

2011-09-29 15:45:04 -04:00

media-monitor

Merge branch '2.0.x' into devel

2012-02-14 14:47:07 -05:00

monit

CC-3222: Add option to disable auto starting Airtime services (after install and after system restart)

2011-12-23 15:53:30 -05:00

pypo

Merge branch '2.0.x' into devel

2012-03-12 17:52:17 -04:00

python-virtualenv

CC-3041: Module virtualenv was already imported

2011-11-25 18:02:56 -05:00

create-pypo-user.py

CC-2758: Make airtime-install script Debian/Ubuntu compatible

2011-11-01 15:21:09 -04:00

remove-pypo-user.py

-create-pypo-user scripts missing an "import sys"

2011-06-16 17:30:16 -04:00