Commit Graph

3 Commits

Author SHA1 Message Date
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
martin aa56344a29 CC-2410: Clean up install process
-hiding a few more warnings.
2011-06-20 17:38:18 -04:00
martin fe14113b58 CC-2410: Clean up install process
-reduced number of messages
-got rid of some warnings.
-moved airtime-install.php, airtime-upgrade.php, airtime-uninstall.php
2011-06-20 17:24:12 -04:00