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

..

DoctrineMigrations

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

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

include

CC-3357: Upgrade script to 2.0.2 doesn't work

2012-02-24 21:02:54 -05:00

upgrades

Merge branch '2.0.x' into devel

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

airtime-dircheck.php

CC-2518: Auto install script for manual install

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

airtime-install

CC-3357: Upgrade script to 2.0.2 doesn't work

2012-02-24 21:02:54 -05: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-3098: Upgrade scripts don't work

2011-11-23 16:31:14 -05:00