James d5d4d50a9e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/models/StoredFile.php airtime_mvc/application/models/airtime/om/BaseCcFiles.php airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php		2012-01-11 12:31:54 -05:00
..
application	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-01-11 12:31:54 -05:00
build	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-01-11 12:31:54 -05:00
library	CC-3072: Test upgrade to 2.0.0 from 1.8.0 and up (including minor versions, except 1.9.1)	2011-11-29 15:19:40 -05:00
public	Merge branch 'group_action_playlist_builder' into devel	2012-01-11 10:42:35 -05: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