martin 9c7bab616d Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/controllers/ScheduleController.php install_minimal/airtime-install install_minimal/include/AirtimeInstall.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/pypo/pypofetch.py python_apps/pypo/pypopush.py		2011-09-09 15:07:43 -04:00
..
application	Merge branch '1.9.1' into devel	2011-09-09 15:07:43 -04:00
build	CC-2774: Insert default 'plan_level' entry	2011-09-06 13:44:01 -04:00
library	Merge branch '1.9.1' into devel	2011-09-09 15:07:43 -04:00
public	Merge branch '1.9.1' into devel	2011-09-09 15:07:43 -04:00
tests	CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly.	2011-04-14 18:55:04 -04:00