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

..

DoctrineMigrations

CC-3081: Upgrade 1.9.5->2.0 fails (PHP fatal error on db)

2011-11-22 12:29:19 -05:00

include

Merge branch '2.0.x' into devel

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

upgrades

Merge branch '2.0.x' into devel

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

airtime-dircheck.php

CC-2518: Auto install script for manual install

2011-07-19 17:30:23 -04:00

airtime-install

Merge branch '2.0.x' into devel

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

airtime-php.ini

CC-2819: Upgrade from 1.8.2 to 1.9.4-RC2 fails on Debian squeeze with 'Failed sql query'

2011-09-14 16:47:07 -04:00

airtime-uninstall

CC-3573: Use posix_geteuid instead of "whoami" to detect who is running PHP script

2012-04-02 19:25:27 -04:00