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
..
AirtimeIni.php	CC-2410: Clean up install process	2011-06-20 17:38:18 -04:00
AirtimeInstall.php	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-install.php	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2011-06-20 18:11:25 -04:00
airtime-uninstall.php	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2011-06-20 18:09:37 -04:00
airtime-upgrade.php	CC-2410: Clean up install process	2011-06-20 17:43:06 -04:00