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

..

airtime-1.7.0

CC-2579: Upgrad fails 1.8->1.9

2011-07-22 15:32:10 -04:00

airtime-1.8.0

Removed OBP refs and code.

2012-02-23 16:08:16 -05:00

airtime-1.8.1

Removed OBP refs and code.

2012-02-23 16:08:16 -05:00

airtime-1.8.2

Removed OBP refs and code.

2012-02-23 16:08:16 -05:00

airtime-1.9.0

Merge branch '2.0.x' into devel

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

airtime-1.9.2

Removed OBP refs and code.

2012-02-23 16:08:16 -05:00

airtime-1.9.3

Removed OBP refs and code.

2012-02-23 16:08:16 -05:00

airtime-1.9.4

Removed OBP refs and code.

2012-02-23 16:08:16 -05:00

airtime-1.9.5

1.9.5 upgrade script had incorrect class name.

2011-11-09 11:51:58 -05:00

airtime-2.0.0

Removed OBP refs and code.

2012-02-23 16:08:16 -05:00

airtime-2.0.1

CC-3224: "On-the-fly" stream rebroadcasting

2012-03-14 14:41:00 -04:00

airtime-2.0.2

CC-3224: "On-the-fly" stream rebroadcasting

2012-03-14 14:41:00 -04:00

airtime-2.0.3

cc-3586: remove monit show-recorder file

2012-04-03 12:28:03 -04:00

airtime-2.1.0

CC-3605 : Create 2.1 upgrades

2012-04-11 18:37:57 +02:00

upgrade-template

CC-3297: Depend on zendframework and php-pear as external packages

2012-02-06 14:18:03 -05:00