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

..

install

SAAS-83: Add ability to install Airtime components separately

2011-11-24 18:10:06 -05:00

__init__.py

CC-2016: Rearrange python scripts for reusability

2011-03-24 00:00:46 -04:00

api_client.cfg

CC-3484: Pypo: On bootup, it should grab station name and stream

2012-03-20 16:41:15 -04:00

api_client.py

Merge branch '2.0.x' into devel

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