Merge branch 'devel' into CC-3174

This commit is contained in:
Naomi Aro 2012-04-10 15:57:13 +02:00
commit b998a04c2e
40 changed files with 354 additions and 234 deletions

View file

@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
$defaultFade = Application_Model_Preference::GetDefaultFade();
if($defaultFade == ""){
$defaultFade = '00.000000';
$defaultFade = '0.500000';
}
//Station name