Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/PlaylistController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Playlist.php airtime_mvc/application/models/StoredFile.php airtime_mvc/public/js/airtime/library/spl.js		2012-02-06 11:07:10 +01:00
..
application	Merge branch 'CC-3174' into devel	2012-02-06 11:07:10 +01:00
build	CC-3174 : showbuilder	2012-02-04 21:26:21 +01: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 'CC-3174' into devel	2012-02-06 11:07:10 +01: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