james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/models/Preference.php		2011-06-20 18:09:37 -04:00
..
css	CC-1724:Phone home statistics	2011-06-20 17:58:38 -04:00
images/datatables	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
js	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2011-06-20 18:09:37 -04:00
.htaccess	CC-2312: Change max_upload_size in .htaccess file	2011-05-20 14:31:28 -04:00
favicon.ico	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
index.php	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