James 8f2339f109 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php airtime_mvc/build/schema.xml airtime_mvc/build/sql/schema.sql		2012-07-26 14:54:47 -04:00
..
sql	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-07-26 14:54:47 -04:00
airtime.conf	CC-3520: Change default password of monit	2012-04-13 17:07:59 -04:00
build.properties	CC-3482: Live Stream: UI Design for Source Stream panel on dashboard	2012-04-03 11:58:48 -04:00
runtime-conf.xml	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
schema.xml	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-07-26 14:54:47 -04:00