Martin Konecny f96b990275 Merge branch '2.0.x' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php

2012-04-12 19:10:17 -04:00

..

pypo-copy-files.py

Merge branch '2.0.x' into devel

2012-04-12 19:10:17 -04:00

pypo-initialize.py

CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly

2012-04-05 20:42:15 -04:00

pypo-remove-files.py

CC-3326: Make /etc/monit/conf.d is empty of any old Airtime files before upgrading!

2012-02-14 09:37:20 -05:00

pypo-uninitialize.py

CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly

2012-04-05 20:42:15 -04:00

pypo-uninstall.py

CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly

2012-04-05 20:42:15 -04:00