Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/models/Preference.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/public/js/airtime/preferences/preferences.js		2011-06-21 11:20:35 +02:00
..
sql	Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel	2011-06-21 11:20:35 +02:00
airtime.conf	cc-2182: convert back to restful design	2011-05-02 15:33:32 -04:00
build.properties	CC-1724:Phone home statistics	2011-06-15 17:51:44 -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 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel	2011-06-21 11:20:35 +02:00