james
|
2fb721167c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2011-06-20 18:11:25 -04:00 |
|
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
|
d9c5e2b6d6
|
-add newline chars to Airtime-upgrade-disabled message
|
2011-06-20 18:03:07 -04:00 |
|
martin
|
f03c0e5f10
|
-Disable upgrades for the 1.9.0 beta.
|
2011-06-20 18:00:26 -04:00 |
|
martin
|
de436486fb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2011-06-20 17:24:24 -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 |